From 389ecc529c5f04653e4331054ae4ca542e3a2c6a Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 31 Dec 2007 16:19:17 -0500 Subject: [PATCH] --- yaml --- r: 79576 b: refs/heads/master c: ef80367071dce7d2533e79ae8f3c84ec42708dc8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprtsock.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b20a2ffebe7..b82eb61da808 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b948ae5be5e22532584113e2e02029519bbad8f +refs/heads/master: ef80367071dce7d2533e79ae8f3c84ec42708dc8 diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index 721c5419765e..25aae8c526e4 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/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 */