[PATCH 223/270] Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."

Herton Ronaldo Krzesinski herton.krzesinski at canonical.com
Mon Nov 26 16:58:33 UTC 2012

3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.


From: Trond Myklebust <Trond.Myklebust at netapp.com>

commit b9d2bb2ee537424a7f855e1f93eed44eb9ee0854 upstream.

This reverts commit 55420c24a0d4d1fce70ca713f84aa00b6b74a70e.
Now that we clear the connected flag when entering TCP_CLOSE_WAIT,
the deadlock described in this commit is no longer possible.
Instead, the resulting call to xs_tcp_shutdown() can interfere
with pending reconnection attempts.

Reported-by: Chris Perl <chris.perl at gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
Tested-by: Chris Perl <chris.perl at gmail.com>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
 net/sunrpc/xprtsock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 683f990b..a3f1990 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -737,10 +737,10 @@ static int xs_tcp_send_request(struct rpc_task *task)
 		dprintk("RPC:       sendmsg returned unrecognized error %d\n",
-	case -EPIPE:
 	case -ENOTCONN:
+	case -EPIPE:
 		clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);

More information about the kernel-team mailing list