Commit 24ca9a84 authored Nov 22, 2011 by Trond Myklebust

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



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
5e3771ce (SUNRPC: Ensure that xs_nospace
return values are propagated).

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org [>= 2.6.30]
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>

parent 866d43c9

net/sunrpc/xprtsock.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

Admin message