]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Oct 2012 15:35:47 +0000 (11:35 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 17:02:57 +0000 (10:02 -0700)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/sunrpc/xprtsock.c

index 6581a9de57992cf1dc3f477d831e4f59d1b88c30..b34cf303d91693a1c988a0aac56c8842105dc221 100644 (file)
@@ -1525,6 +1525,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:
                /*