aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-12-31 16:19:17 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:05:25 -0500
commitef80367071dce7d2533e79ae8f3c84ec42708dc8 (patch)
tree48246449698c55b40791a98713005b55682849b2 /net/sunrpc/xprtsock.c
parent3b948ae5be5e22532584113e2e02029519bbad8f (diff)
SUNRPC: TCP clear XPRT_CLOSE_WAIT when the socket is closed for writes
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 721c5419765e..25aae8c526e4 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1125,6 +1125,7 @@ static void xs_tcp_state_change(struct sock *sk)
1125 set_bit(XPRT_CLOSING, &xprt->state); 1125 set_bit(XPRT_CLOSING, &xprt->state);
1126 smp_mb__before_clear_bit(); 1126 smp_mb__before_clear_bit();
1127 clear_bit(XPRT_CONNECTED, &xprt->state); 1127 clear_bit(XPRT_CONNECTED, &xprt->state);
1128 clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
1128 smp_mb__after_clear_bit(); 1129 smp_mb__after_clear_bit();
1129 break; 1130 break;
1130 case TCP_CLOSE_WAIT: 1131 case TCP_CLOSE_WAIT:
@@ -1139,6 +1140,7 @@ static void xs_tcp_state_change(struct sock *sk)
1139 break; 1140 break;
1140 case TCP_CLOSE: 1141 case TCP_CLOSE:
1141 smp_mb__before_clear_bit(); 1142 smp_mb__before_clear_bit();
1143 clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
1142 clear_bit(XPRT_CLOSING, &xprt->state); 1144 clear_bit(XPRT_CLOSING, &xprt->state);
1143 smp_mb__after_clear_bit(); 1145 smp_mb__after_clear_bit();
1144 /* Mark transport as closed and wake up all pending tasks */ 1146 /* Mark transport as closed and wake up all pending tasks */