summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-06-11 12:00:45 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-07-10 08:04:14 +0200
commit497f9625c2bbd6a8525fb2eedb22a382a6a8253c (patch)
tree8637f882dbe2eea6a731a6df0317a276bf2cfec3 /fs
parentsplice: divorce the splice structure/function definitions from the pipe header (diff)
downloadlinux-497f9625c2bbd6a8525fb2eedb22a382a6a8253c.tar.xz
linux-497f9625c2bbd6a8525fb2eedb22a382a6a8253c.zip
pipe: allow passing around of ops private pointer
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/splice.c b/fs/splice.c
index bea9f1581ca0..00850e56280d 100644
--- a/fs/splice.c
+++ b/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;