--- net/sunrpc/xprtsock.c

+++ net/sunrpc/xprtsock.c

@@ -1343,10 +1343,11 @@ static void xs_tcp_state_change(struct s

if (!(xprt = xprt_from_sock(sk)))

goto out;

dprintk("RPC: xs_tcp_state_change client %p...\n", xprt);

- dprintk("RPC: state %x conn %d dead %d zapped %d\n",

+ dprintk("RPC: state %x conn %d dead %d zapped %d sk_shutdown %d\n",

sk->sk_state, xprt_connected(xprt),

sock_flag(sk, SOCK_DEAD),

- sock_flag(sk, SOCK_ZAPPED));

+ sock_flag(sk, SOCK_ZAPPED),

+ sk->sk_shutdown);

switch (sk->sk_state) {

case TCP_ESTABLISHED:

@@ -1817,10 +1818,25 @@ static void xs_tcp_reuse_connection(stru

{

unsigned int state = transport->inet->sk_state;

- if (state == TCP_CLOSE && transport->sock->state == SS_UNCONNECTED)

- return;

- if ((1 << state) & (TCPF_ESTABLISHED|TCPF_SYN_SENT))

- return;

+ if (state == TCP_CLOSE && transport->sock->state == SS_UNCONNECTED) {

+ /* we don't need to abort the connection if the socket

+ * hasn't undergone a shutdown

+ */

+ if (transport->inet->sk_shutdown == 0)

+ return;

+ dprintk("RPC: %s: TCP_CLOSEd and sk_shutdown set to %d\n",

+ __func__, transport->inet->sk_shutdown);

+ }

+ if ((1 << state) & (TCPF_ESTABLISHED|TCPF_SYN_SENT)) {

+ /* we don't need to abort the connection if the socket

+ * hasn't undergone a shutdown

+ */

+ if (transport->inet->sk_shutdown == 0)

+ return;

+ dprintk("RPC: %s: ESTABLISHED/SYN_SENT "

+ "sk_shutdown set to %d\n",

+ __func__, transport->inet->sk_shutdown);

+ }

xs_abort_connection(xprt, transport);

}