p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/smc: continue waiting if peer signals write_shutdown 

If the peer sends a shutdown WRITE, this should not affect sending
in general, and waiting for send buffer space in particular.
Stop waiting of the local socket for send buffer space only, if peer
signals closing, but not if peer signals just shutdown WRITE.

Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ursula Braun 2018-01-24 10:28:17 +01:00 committed by David S. Miller
parent bbb96bf236
commit aa377e682d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/smc/smc_tx.c
View File

@ -86,7 +86,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)
rc = -EPIPE; rc = -EPIPE;
break; break;
} }
if (conn->local_rx_ctrl.conn_state_flags.peer_conn_abort) { if (smc_cdc_rxed_any_close(conn)) {
rc = -ECONNRESET; rc = -ECONNRESET;
break; break;
} }
@ -107,7 +107,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)
sk_wait_event(sk, &timeo, sk_wait_event(sk, &timeo,
sk->sk_err || sk->sk_err ||
(sk->sk_shutdown & SEND_SHUTDOWN) || (sk->sk_shutdown & SEND_SHUTDOWN) ||
smc_cdc_rxed_any_close_or_senddone(conn) || smc_cdc_rxed_any_close(conn) ||
atomic_read(&conn->sndbuf_space), atomic_read(&conn->sndbuf_space),
&wait); &wait);
} }