diff options
| author | David Howells <dhowells@redhat.com> | 2018-10-08 15:46:17 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2018-10-08 22:42:04 +0100 |
| commit | 647530924f47c93db472ee3cf43b7ef1425581b6 (patch) | |
| tree | 49c180e0069489ae18d8f60fcf089da7d523ed86 /net/rxrpc/ar-internal.h | |
| parent | 298bc15b2079c324e82d0a6fda39c3d762af7282 (diff) | |
| download | linux-647530924f47c93db472ee3cf43b7ef1425581b6.tar.gz linux-647530924f47c93db472ee3cf43b7ef1425581b6.tar.bz2 linux-647530924f47c93db472ee3cf43b7ef1425581b6.zip | |
rxrpc: Fix connection-level abort handling
Fix connection-level abort handling to cache the abort and error codes
properly so that a new incoming call can be properly aborted if it races
with the parent connection being aborted by another CPU.
The abort_code and error parameters can then be dropped from
rxrpc_abort_calls().
Fixes: f5c17aaeb2ae ("rxrpc: Calls should only have one terminal state")
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/ar-internal.h')
| -rw-r--r-- | net/rxrpc/ar-internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index ab60c0313fd4..45307463b7dd 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -442,8 +442,7 @@ struct rxrpc_connection { spinlock_t state_lock; /* state-change lock */ enum rxrpc_conn_cache_state cache_state; enum rxrpc_conn_proto_state state; /* current state of connection */ - u32 local_abort; /* local abort code */ - u32 remote_abort; /* remote abort code */ + u32 abort_code; /* Abort code of connection abort */ int debug_id; /* debug ID for printks */ atomic_t serial; /* packet serial number counter */ unsigned int hi_serial; /* highest serial number received */ @@ -453,6 +452,7 @@ struct rxrpc_connection { u8 security_size; /* security header size */ u8 security_ix; /* security type */ u8 out_clientflag; /* RXRPC_CLIENT_INITIATED if we are client */ + short error; /* Local error code */ }; static inline bool rxrpc_to_server(const struct rxrpc_skb_priv *sp) |