diff options
| author | Eric Dumazet <edumazet@google.com> | 2018-07-07 23:15:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-08 17:14:58 +0900 |
| commit | c47078d6a33fd78d882200cdaacbcfcd63318234 (patch) | |
| tree | d8ca13d8919bf0f915a84ebe70050b60761619e4 /net/ipv4 | |
| parent | 3d907eafa34335bb379fd429dcd326e3f44aff19 (diff) | |
| download | talos-obmc-linux-c47078d6a33fd78d882200cdaacbcfcd63318234.tar.gz talos-obmc-linux-c47078d6a33fd78d882200cdaacbcfcd63318234.zip | |
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 850dc8f15afc..c4082cd50257 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -817,8 +817,7 @@ 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; + ret = -ENOTCONN; break; } if (!timeo) { @@ -2042,13 +2041,10 @@ 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; - } + /* This occurs when user tries to read + * from never connected socket. + */ + copied = -ENOTCONN; break; } |
