]> git.karo-electronics.de Git - karo-tx-linux.git/commit
splice: fix misuse of SPLICE_F_NONBLOCK
authorMiklos Szeredi <miklos@szeredi.hu>
Tue, 3 Aug 2010 10:48:50 +0000 (12:48 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 13 Aug 2010 20:27:15 +0000 (13:27 -0700)
commit52f2ce19c8dacce192b43eff3707ca682f934d96
tree84fcf4009cf728ea3a5e9c583c9d214c053e04a5
parent4eb2bc52a6cc10c94c1da8f96d8612a5e916d65c
splice: fix misuse of SPLICE_F_NONBLOCK

commit 6965031d331a642e31278fa1b5bd47f372ffdd5d upstream.

SPLICE_F_NONBLOCK is clearly documented to only affect blocking on the
pipe.  In __generic_file_splice_read(), however, it causes an EAGAIN
if the page is currently being read.

This makes it impossible to write an application that only wants
failure if the pipe is full.  For example if the same process is
handling both ends of a pipe and isn't otherwise able to determine
whether a splice to the pipe will fill it or not.

We could make the read non-blocking on O_NONBLOCK or some other splice
flag, but for now this is the simplest fix.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/splice.c