Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Oct 2012 15:40:02 +0000 (11:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 17:02:57 +0000 (10:02 -0700)
commitdedf1c2d17cd81796fc25190fd194e8dd0269817
tree92b61790db24f33e70d35e46a9e255a2c1f94998
parentea2887242aafd45727ca22564105fd244f4c6584
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sunrpc/xprtsock.c