Commit 7945cc64 authored by David S. Miller's avatar David S. Miller

tcp: Kill extraneous SPLICE_F_NONBLOCK checks.

In splice TCP receive, the SPLICE_F_NONBLOCK flag is used
to compute the "timeo" value.  So checking it again inside
of the main receive loop to trigger -EAGAIN processing is
entirely unnecessary.

Noticed by Jarek P. and Lennert Buytenhek.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f7d54f5
...@@ -597,10 +597,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, ...@@ -597,10 +597,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
ret = -ENOTCONN; ret = -ENOTCONN;
break; break;
} }
if (flags & SPLICE_F_NONBLOCK) {
ret = -EAGAIN;
break;
}
if (!timeo) { if (!timeo) {
ret = -EAGAIN; ret = -EAGAIN;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment