UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

smc: cleanup close checking during data receival 

When waiting for data to be received it must be checked if the
peer signals shutdown. The SMC code uses two different checks
for this purpose, even though just one check is sufficient.
This patch removes the superfluous test for SOCK_DONE.

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 2017-12-07 13:38:47 +01:00 committed by David S. Miller
parent 4bd3e7fbfa
commit 71c125c3f2
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/smc/smc_rx.c
View File

@ -65,7 +65,6 @@ static int smc_rx_wait_data(struct smc_sock *smc, long *timeo)
rc = sk_wait_event(sk, timeo, rc = sk_wait_event(sk, timeo,
sk->sk_err || sk->sk_err ||
sk->sk_shutdown & RCV_SHUTDOWN || sk->sk_shutdown & RCV_SHUTDOWN ||
sock_flag(sk, SOCK_DONE) ||
atomic_read(&conn->bytes_to_rcv) || atomic_read(&conn->bytes_to_rcv) ||
smc_cdc_rxed_any_close_or_senddone(conn), smc_cdc_rxed_any_close_or_senddone(conn),
&wait); &wait);
@ -116,7 +115,7 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, size_t len,
if (read_done) { if (read_done) {
if (sk->sk_err || if (sk->sk_err ||
sk->sk_state == SMC_CLOSED || sk->sk_state == SMC_CLOSED ||
(sk->sk_shutdown & RCV_SHUTDOWN) || sk->sk_shutdown & RCV_SHUTDOWN ||
!timeo || !timeo ||
signal_pending(current) || signal_pending(current) ||
smc_cdc_rxed_any_close_or_senddone(conn) || smc_cdc_rxed_any_close_or_senddone(conn) ||
@ -124,8 +123,6 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, size_t len,
peer_conn_abort) peer_conn_abort)
break; break;
} else { } else {
if (sock_flag(sk, SOCK_DONE))
break;
if (sk->sk_err) { if (sk->sk_err) {
read_done = sock_error(sk); read_done = sock_error(sk);
break; break;