aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-23 11:35:47 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-10-30 23:26:56 +0000
commit86024793d4781612d47a3e63a7682a9c3de1d771 (patch)
treec81160ac930563290bb0e7995aa132d1d4e42811 /net/sunrpc
parent1d3bda6f1b995e50f3c8529333471351b986c503 (diff)
downloadkernel_samsung_smdk4412-86024793d4781612d47a3e63a7682a9c3de1d771.zip
kernel_samsung_smdk4412-86024793d4781612d47a3e63a7682a9c3de1d771.tar.gz
kernel_samsung_smdk4412-86024793d4781612d47a3e63a7682a9c3de1d771.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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/sunrpc')
-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 d68b653..0795f81 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:
/*