Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c47078d6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: remove redundant SOCK_DONE checks 



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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d907eaf

net/ipv4/tcp.c

+5 −9
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, 
				 * This occurs when user tries to read

				 * from never connected socket.

				 */

				if (!sock_flag(sk, SOCK_DONE))

				ret = -ENOTCONN;

				break;

			}
@@ -2042,15 +2041,12 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock, 
				break;



			if (sk->sk_state == TCP_CLOSE) {

				if (!sock_flag(sk, SOCK_DONE)) {

				/* This occurs when user tries to read

				 * from never connected socket.

				 */

				copied = -ENOTCONN;

				break;

			}

				break;

			}



			if (!timeo) {

				copied = -EAGAIN;