[PATCH net] rxrpc: rxrpc_kernel_send_data() needs to handle failed call better

From	David Howells <dhowells@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH net] rxrpc: rxrpc_kernel_send_data() needs to handle failed call better
Date	2017-03-09 09:20 +0100
Message-ID	<tj1sK-2tF-7@gated-at.bofh.it> (permalink)
Organization	Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903

Show all headers | View raw

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>
---

 net/rxrpc/sendmsg.c |    5 +++--
 1 file 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 */

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net] rxrpc: rxrpc_kernel_send_data() needs to handle failed  call better David Howells <dhowells@redhat.com> - 2017-03-09 09:20 +0100
  Re: [PATCH net] rxrpc: rxrpc_kernel_send_data() needs to handle  failed call better David Miller <davem@davemloft.net> - 2017-03-10 03:40 +0100

csiph-web