Commit 7945cc64 authored Jan 05, 2009 by 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: David S. Miller <davem@davemloft.net>

parent 4f7d54f5

net/ipv4/tcp.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -597,10 +597,6 @@ ssize_t tcp_splice_read(struct socket sock, loff_t ppos,
		ret = -ENOTCONN;
		break;
		}
		if (flags & SPLICE_F_NONBLOCK) {
		ret = -EAGAIN;
		break;
		}
		if (!timeo) {
		ret = -EAGAIN;
		break;