aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-23 11:35:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 09:51:34 -0700
commit5acfec95af2aa4a9982534557e3ad035e3e5ea86 (patch)
tree2a6991f9828789f3120b2a3749e939d7f683210c
parent5b34d96acadef305c862006ce5d079dfb6526ee8 (diff)
downloadkernel_samsung_crespo-5acfec95af2aa4a9982534557e3ad035e3e5ea86.zip
kernel_samsung_crespo-5acfec95af2aa4a9982534557e3ad035e3e5ea86.tar.gz
kernel_samsung_crespo-5acfec95af2aa4a9982534557e3ad035e3e5ea86.tar.bz2
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 fad08c8..6defa77 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1512,6 +1512,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:
/*