From: Trond Myklebust Date: Mon, 31 Dec 2007 21:19:17 +0000 (-0500) Subject: SUNRPC: TCP clear XPRT_CLOSE_WAIT when the socket is closed for writes X-Git-Tag: v2.6.25-rc1~1146^2~106 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef80367071dce7d2533e79ae8f3c84ec42708dc8;p=linux-2.6-omap-h63xx.git SUNRPC: TCP clear XPRT_CLOSE_WAIT when the socket is closed for writes Signed-off-by: Trond Myklebust --- diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 721c5419765..25aae8c526e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1125,6 +1125,7 @@ static void xs_tcp_state_change(struct sock *sk) set_bit(XPRT_CLOSING, &xprt->state); smp_mb__before_clear_bit(); clear_bit(XPRT_CONNECTED, &xprt->state); + clear_bit(XPRT_CLOSE_WAIT, &xprt->state); smp_mb__after_clear_bit(); break; case TCP_CLOSE_WAIT: @@ -1139,6 +1140,7 @@ static void xs_tcp_state_change(struct sock *sk) break; case TCP_CLOSE: smp_mb__before_clear_bit(); + clear_bit(XPRT_CLOSE_WAIT, &xprt->state); clear_bit(XPRT_CLOSING, &xprt->state); smp_mb__after_clear_bit(); /* Mark transport as closed and wake up all pending tasks */