diff options
| author | David Howells <dhowells@redhat.com> | 2017-03-09 08:10:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-09 18:30:10 -0800 |
| commit | 6fc166d62c6f9f6eda5ea300f671d34e89bdd3c8 (patch) | |
| tree | 6df3f8fefe6cb6ea23623e2f5eaaa15b04594826 /net/rxrpc | |
| parent | 4b3b45edba9222e518a1ec72df841eba3609fe34 (diff) | |
| download | linux-6fc166d62c6f9f6eda5ea300f671d34e89bdd3c8.tar.bz2 | |
rxrpc: rxrpc_kernel_send_data() needs to handle failed call better
If rxrpc_kernel_send_data() is asked to send data through a call that has
already failed (due to a remote abort, received protocol error or network
error), then return the associated error code saved in the call rather than
ESHUTDOWN.
This allows the caller to work out whether to ask for the abort code or not
based on this.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/sendmsg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c index 47ccfeacc1c6..97ab214ca411 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -618,8 +618,9 @@ int rxrpc_kernel_send_data(struct socket *sock, struct rxrpc_call *call, ret = rxrpc_send_data(rxrpc_sk(sock->sk), call, msg, len); break; case RXRPC_CALL_COMPLETE: - /* It's too late for this call */ - ret = -ESHUTDOWN; + read_lock_bh(&call->state_lock); + ret = -call->error; + read_unlock_bh(&call->state_lock); break; default: /* Request phase complete for this client call */ |