Re: splice from half-closed socket returning -EAGAIN

[Lennert Buytenhek <buytenh@wantstofly.org>]

On Mon, Jan 05, 2009 at 12:14:01AM -0800, David Miller wrote:

> > > > 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>
> > > 
> > > This change looks like the perfect fix for this problem.
> > > 
> > 
> > Actually, I wonder why this "if (flags & SPLICE_F_NONBLOCK)" can't
> > be skipped at all. Isn't "if (!timeo)" enough now?
> 
> Is it really the same condition in the end?

It _seems_ to be?  This:

        timeo = sock_rcvtimeo(sk, flags & SPLICE_F_NONBLOCK);

sets 'timeo' to zero if SPLICE_F_NONBLOCK is set.  And when we get
to the timeo / SPLICE_F_NONBLOCK checks, it must be in the first
iteration of the loop, because if 'spliced' was nonzero, it would
have broken out of the loop earlier, and we wouldn't have reached
the check at all.

So it would seem that the SPLICE_F_NONBLOCK check can be deleted
entirely.