From: Ursula Braun <ubraun@linux.vnet.ibm.com>

Date: Wed, 24 Jan 2018 10:28:17 +0100

Subject: net/smc: continue waiting if peer signals write_shutdown

Patch-mainline: v4.16-rc1

Git-commit: aa377e682d0703452642d4059a94ab7fdaa90b89

References: bsc#1096003, FATE#325023, LTC#164003

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>

Acked-by: Johannes Thumshirn <jthumshirn@suse.de>

---

 net/smc/smc_tx.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c

index 2e50fddf8ce9..fea6482233a6 100644

--- a/net/smc/smc_tx.c

+++ b/net/smc/smc_tx.c

@@ -86,7 +86,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)

 			rc = -EPIPE;

 			break;

 		}

-		if (conn->local_rx_ctrl.conn_state_flags.peer_conn_abort) {

+		if (smc_cdc_rxed_any_close(conn)) {

 			rc = -ECONNRESET;

 			break;

 		}

@@ -107,7 +107,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags)

 		sk_wait_event(sk, &timeo,

 			      sk->sk_err ||

 			      (sk->sk_shutdown & SEND_SHUTDOWN) ||

-			      smc_cdc_rxed_any_close_or_senddone(conn) ||

+			      smc_cdc_rxed_any_close(conn) ||

 			      atomic_read(&conn->sndbuf_space),

 			      &wait);

 	}