Pārlūkot izejas kodu

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>
Ursula Braun 7 gadi atpakaļ
vecāks
revīzija
aa377e682d
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      net/smc/smc_tx.c

+ 2 - 2
net/smc/smc_tx.c

@@ -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);
 	}
 	}