From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Oct 2012 15:35:47 +0000 (-0400)
Subject: SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
X-Git-Tag: v3.2.33~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86024793d4781612d47a3e63a7682a9c3de1d771;p=thirdparty%2Fkernel%2Fstable.git

SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT

commit d0bea455dd48da1ecbd04fedf00eb89437455fdc upstream.

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>
Tested-by: Chris Perl <chris.perl@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index d68b653af7bf5..0795f811181cc 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1528,6 +1528,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:
 		/*