From: Olga Kornievskaia <kolga@xxxxxxxxxx> When server replies with an ACK to client's FIN/ACK, client ends up stuck in a TCP_FIN_WAIT2 state and client's mount hangs. Instead, make sure to close and reset client's socket and transport when transitioned into that state. Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx> --- net/sunrpc/xprtsock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 618e9c2..812e5e3 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1502,6 +1502,7 @@ static void xs_tcp_state_change(struct sock *sk) clear_bit(XPRT_CLOSE_WAIT, &xprt->state); smp_mb__after_atomic(); break; + case TCP_FIN_WAIT2: case TCP_CLOSE_WAIT: /* The server initiated a shutdown of the socket */ xprt->connect_cookie++; @@ -2152,6 +2153,7 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt) kernel_sock_shutdown(sock, SHUT_RDWR); trace_rpc_socket_shutdown(xprt, sock); break; + case TCP_FIN_WAIT2: case TCP_CLOSE: case TCP_TIME_WAIT: xs_reset_transport(transport); -- 1.8.3.1
