diff --git a/[refs] b/[refs] index 6ca045483882..f82500d75e3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6b29d7cee064f28ca097e906de7453541351095 +refs/heads/master: 497f9625c2bbd6a8525fb2eedb22a382a6a8253c diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index bea9f1581ca0..00850e56280d 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -185,6 +185,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/trunk/include/linux/pipe_fs_i.h b/trunk/include/linux/pipe_fs_i.h index 7ba228d52f58..4409167b9eb2 100644 --- a/trunk/include/linux/pipe_fs_i.h +++ b/trunk/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/trunk/include/linux/splice.h b/trunk/include/linux/splice.h index f8cc97f71cd0..33e447f98a54 100644 --- a/trunk/include/linux/splice.h +++ b/trunk/include/linux/splice.h @@ -41,6 +41,7 @@ struct splice_desc { struct partial_page { unsigned int offset; unsigned int len; + unsigned long private; }; /*