diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-23 11:40:02 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-30 23:26:56 +0000 |
| commit | b6181a66e2678087ce98dd47554bd4a3ce54788d (patch) | |
| tree | d3c70d7e0659492ead7e56b47e4d7572d348b5e0 /net/sunrpc | |
| parent | 86024793d4781612d47a3e63a7682a9c3de1d771 (diff) | |
| download | kernel_samsung_smdk4412-b6181a66e2678087ce98dd47554bd4a3ce54788d.zip kernel_samsung_smdk4412-b6181a66e2678087ce98dd47554bd4a3ce54788d.tar.gz kernel_samsung_smdk4412-b6181a66e2678087ce98dd47554bd4a3ce54788d.tar.bz2 | |
Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
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@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Tested-by: Chris Perl <chris.perl@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 0795f81..1daaca5 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", -status); case -ECONNRESET: - case -EPIPE: xs_tcp_shutdown(xprt); case -ECONNREFUSED: case -ENOTCONN: + case -EPIPE: clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags); } |