summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-23 17:35:47 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-24 16:44:49 +0200
commitd0bea455dd48da1ecbd04fedf00eb89437455fdc (patch)
tree75f7f748bbcc8c501d1429268bd4163b028cb184 /net
parentMerge tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linu... (diff)
downloadlinux-d0bea455dd48da1ecbd04fedf00eb89437455fdc.tar.xz
linux-d0bea455dd48da1ecbd04fedf00eb89437455fdc.zip
SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
This is needed to ensure that we call xprt_connect() upon the next call to call_connect(). Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@vger.kernel.org Tested-by: Chris Perl <chris.perl@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtsock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index aaaadfbe36e9..6e6967d5400e 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1516,6 +1516,7 @@ static void xs_tcp_state_change(struct sock *sk)
case TCP_CLOSE_WAIT:
/* The server initiated a shutdown of the socket */
xprt->connect_cookie++;
+ clear_bit(XPRT_CONNECTED, &xprt->state);
xs_tcp_force_close(xprt);
case TCP_CLOSING:
/*