diff options
| author | David Howells <dhowells@redhat.com> | 2016-08-30 09:49:28 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-08-30 15:58:31 +0100 |
| commit | f5c17aaeb2aee9b6c30d082bbe652a7e5589adff (patch) | |
| tree | bc2ec0c32190f3a2de5e1d322d745232ff96771b /net/rxrpc/proc.c | |
| parent | ccbd3dbe85e1445231a7e0da2dada130cedce9d0 (diff) | |
| download | lwn-f5c17aaeb2aee9b6c30d082bbe652a7e5589adff.tar.gz lwn-f5c17aaeb2aee9b6c30d082bbe652a7e5589adff.zip | |
rxrpc: Calls should only have one terminal state
Condense the terminal states of a call state machine to a single state,
plus a separate completion type value. The value is then set, along with
error and abort code values, only when the call is transitioned to the
completion state.
Helpers are provided to simplify this.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/proc.c')
| -rw-r--r-- | net/rxrpc/proc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c index 060fb4892c39..82c64055449d 100644 --- a/net/rxrpc/proc.c +++ b/net/rxrpc/proc.c @@ -22,7 +22,6 @@ static const char *const rxrpc_conn_states[RXRPC_CONN__NR_STATES] = { [RXRPC_CONN_SERVICE] = "SvSecure", [RXRPC_CONN_REMOTELY_ABORTED] = "RmtAbort", [RXRPC_CONN_LOCALLY_ABORTED] = "LocAbort", - [RXRPC_CONN_NETWORK_ERROR] = "NetError", }; /* @@ -94,7 +93,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v) rxrpc_is_service_call(call) ? "Svc" : "Clt", atomic_read(&call->usage), rxrpc_call_states[call->state], - call->remote_abort ?: call->local_abort, + call->abort_code, call->user_call_ID); return 0; |