lkml.org 
[lkml]   [2010]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[13/54] splice: fix misuse of SPLICE_F_NONBLOCK
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Miklos Szeredi <miklos@szeredi.hu>

    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 | 12 +-----------
    1 file changed, 1 insertion(+), 11 deletions(-)

    --- a/fs/splice.c
    +++ b/fs/splice.c
    @@ -366,17 +366,7 @@ __generic_file_splice_read(struct file *
    * If the page isn't uptodate, we may need to start io on it
    */
    if (!PageUptodate(page)) {
    - /*
    - * If in nonblock mode then dont block on waiting
    - * for an in-flight io page
    - */
    - if (flags & SPLICE_F_NONBLOCK) {
    - if (!trylock_page(page)) {
    - error = -EAGAIN;
    - break;
    - }
    - } else
    - lock_page(page);
    + lock_page(page);

    /*
    * Page was truncated, or invalidated by the



    \
     
     \ /
      Last update: 2010-08-12 02:29    [W:0.021 / U:154.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site