SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 22 Nov 2011 12:44:28 +0000 (14:44 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Dec 2011 16:54:18 +0000 (08:54 -0800)
commit453fdf5561cc042b7e127af6a62138969726f539
tree5e9fc9050ee189f15b60092448cb6581f272dd0d
parent854b259aa1fbb2f4e63ba02a008f48c36606e73d
SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared

commit 24ca9a847791fd53d9b217330b15f3c285827a18 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
5e3771ce2d6a69e10fcc870cdf226d121d868491 (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>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/sunrpc/xprtsock.c