Patchwork [3.5.yuz,extended,stable] Patch "Revert "SUNRPC: Ensure we close the socket on EPIPE errors" has been added to staging queue

mail settings
Submitter Herton Ronaldo Krzesinski
Date Nov. 22, 2012, 4:48 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/200977/
State New
Headers show


Herton Ronaldo Krzesinski - Nov. 22, 2012, 4:48 a.m.
This is a note to let you know that I have just added a patch titled

    Revert "SUNRPC: Ensure we close the socket on EPIPE errors

to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.yuz tree, see



From 9cd6283f898dae34cdc648808864b02006ced34f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <>
Date: Tue, 23 Oct 2012 11:40:02 -0400
Subject: [PATCH] Revert "SUNRPC: Ensure we close the socket on EPIPE errors

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 <>
Signed-off-by: Trond Myklebust <>
Tested-by: Chris Perl <>
Signed-off-by: Herton Ronaldo Krzesinski <>
 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);