From: Lennert Buytenhek Date: Tue, 20 Jan 2009 23:25:21 +0000 (-0800) Subject: tcp: don't mask EOF and socket errors on nonblocking splice receive X-Git-Tag: v2.6.27.13~33 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2552605f3b34253754c05ffd84a585514eecc62;p=pandora-kernel.git 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed