xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: remove redundant SOCK_DONE checks

Browse Source 
In both tcp_splice_read() and tcp_recvmsg(), we already test
sock_flag(sk, SOCK_DONE) right before evaluating sk->sk_state,
so "!sock_flag(sk, SOCK_DONE)" is always true.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2018-07-07 23:15:56 -07:00
committed by David S. Miller
parent 3d907eafa3
commit c47078d6a3
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/tcp.c
View File

@@ -817,7 +817,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
* This occurs when user tries to read * This occurs when user tries to read
* from never connected socket. * from never connected socket.
*/ */
if (!sock_flag(sk, SOCK_DONE))
ret = -ENOTCONN; ret = -ENOTCONN;
break; break;
} }
@@ -2042,15 +2041,12 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
break; break;
if (sk->sk_state == TCP_CLOSE) { if (sk->sk_state == TCP_CLOSE) {
if (!sock_flag(sk, SOCK_DONE)) {
/* This occurs when user tries to read /* This occurs when user tries to read
* from never connected socket. * from never connected socket.
*/ */
copied = -ENOTCONN; copied = -ENOTCONN;
break; break;
} }
break;
}
if (!timeo) { if (!timeo) {
copied = -EAGAIN; copied = -EAGAIN;