SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared

commit 24ca9a8 upstream. By returning '0' instead of 'EAGAIN' when the tests in xs_nospace() fail to find evidence of socket congestion, we are making the RPC engine believe that the message was incorrectly sent and so it disconnects the socket instead of just retrying. The bug appears to have been introduced by commit 5e3771c (SUNRPC: Ensure that xs_nospace return values are propagated). Reported-by: Andrew Cooper <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Tested-by: Andrew Cooper <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
AndroidRoot · Dec 9, 2011 · 453fdf5 · 453fdf5
1 parent 854b259
commit 453fdf5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
@@ -496,7 +496,7 @@ static int xs_nospace(struct rpc_task *task)
 	struct rpc_rqst *req = task->tk_rqstp;
 	struct rpc_xprt *xprt = req->rq_xprt;
 	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
-	int ret = 0;
+	int ret = -EAGAIN;
 
 	dprintk("RPC: %5u xmit incomplete (%u left of %u)\n",
 			task->tk_pid, req->rq_slen - req->rq_bytes_sent,
@@ -508,7 +508,6 @@ static int xs_nospace(struct rpc_task *task)
 	/* Don't race with disconnect */
 	if (xprt_connected(xprt)) {
 		if (test_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags)) {
-			ret = -EAGAIN;
 			/*
 			 * Notify TCP that we're limited by the application
 			 * window size