]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
tcp: don't mask EOF and socket errors on nonblocking splice receive
authorLennert Buytenhek <buytenh@marvell.com>
Tue, 20 Jan 2009 23:25:21 +0000 (15:25 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 25 Jan 2009 00:36:19 +0000 (16:36 -0800)
commitd2552605f3b34253754c05ffd84a585514eecc62
treea3869d65d3816cabf016032e7ab70e4d0775b18e
parentd83217ac36ce6ed15c852970614371336f26f837
tcp: don't mask EOF and socket errors on nonblocking splice receive

[ Upstream commit: 4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 ]

Currently, setting SPLICE_F_NONBLOCK on splice from a TCP socket
results in masking of EOF (RDHUP) and error conditions on the socket
by an -EAGAIN return.  Move the NONBLOCK check in tcp_splice_read()
to be after the EOF and error checks to fix this.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/tcp.c