lkml.org 
[lkml]   [2007]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/18] pipe: allow passing around of ops private pointer
    Date
    relay needs this for proper consumption handling, and the network
    receive support needs it as well to lookup the sk_buff on pipe
    release.

    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    ---
    fs/splice.c | 1 +
    include/linux/pipe_fs_i.h | 1 +
    include/linux/splice.h | 1 +
    3 files changed, 3 insertions(+), 0 deletions(-)

    diff --git a/fs/splice.c b/fs/splice.c
    index 15d3f4b..ff62ac9 100644
    --- a/fs/splice.c
    +++ b/fs/splice.c
    @@ -184,6 +184,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
    buf->page = spd->pages[page_nr];
    buf->offset = spd->partial[page_nr].offset;
    buf->len = spd->partial[page_nr].len;
    + buf->private = spd->partial[page_nr].private;
    buf->ops = spd->ops;
    if (spd->flags & SPLICE_F_GIFT)
    buf->flags |= PIPE_BUF_FLAG_GIFT;
    diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
    index 7ba228d..4409167 100644
    --- a/include/linux/pipe_fs_i.h
    +++ b/include/linux/pipe_fs_i.h
    @@ -14,6 +14,7 @@ struct pipe_buffer {
    unsigned int offset, len;
    const struct pipe_buf_operations *ops;
    unsigned int flags;
    + unsigned long private;
    };

    struct pipe_inode_info {
    diff --git a/include/linux/splice.h b/include/linux/splice.h
    index b3f1528..1a1182b 100644
    --- a/include/linux/splice.h
    +++ b/include/linux/splice.h
    @@ -41,6 +41,7 @@ struct splice_desc {
    struct partial_page {
    unsigned int offset;
    unsigned int len;
    + unsigned long private;
    };

    /*
    --
    1.5.2.1.174.gcd03
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-12 09:07    [W:0.058 / U:0.320 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site