diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-12-31 16:19:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:05:25 -0500 |
| commit | ef80367071dce7d2533e79ae8f3c84ec42708dc8 (patch) | |
| tree | 48246449698c55b40791a98713005b55682849b2 /net | |
| parent | 3b948ae5be5e22532584113e2e02029519bbad8f (diff) | |
| download | linux-ef80367071dce7d2533e79ae8f3c84ec42708dc8.tar.gz linux-ef80367071dce7d2533e79ae8f3c84ec42708dc8.tar.bz2 linux-ef80367071dce7d2533e79ae8f3c84ec42708dc8.zip | |
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')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
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) 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 */ |