Commit b9d2bb2e authored Oct 23, 2012 by Trond Myklebust

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



This reverts commit 55420c24.
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@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
Tested-by: Chris Perl <chris.perl@gmail.com>

parent d0bea455

net/sunrpc/xprtsock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -737,10 +737,10 @@ static int xs_tcp_send_request(struct rpc_task *task)
		dprintk("RPC: sendmsg returned unrecognized error %d\n",
		-status);
		case -ECONNRESET:
		case -EPIPE:
		xs_tcp_shutdown(xprt);
		case -ECONNREFUSED:
		case -ENOTCONN:
		case -EPIPE:
		clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);
		}

Admin message