| commit | 4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 | |
| author | Lennert Buytenhek <buytenh@marvell.com> | |
| Mon, 5 Jan 2009 08:00:12 +0000 (5 00:00 -0800) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Mon, 5 Jan 2009 08:00:12 +0000 (5 00:00 -0800) | ||
| tree | 9d391a6c4d9fdb1c8534127702b5543b0b5ab089 | treesnapshot (tar.gz zip) |
| parent | 129fa44785a399248ae2466b6cb5c655e96668f7 | commitdiff |
tcp: don't mask EOF and socket errors on nonblocking splice receive
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>
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>
| net/ipv4/tcp.c | diffblobblamehistory |