summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--fs/splice.c1
-rw-r--r--include/linux/pipe_fs_i.h1
-rw-r--r--include/linux/splice.h1
3 files changed, 3 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;
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 7ba228d52f58..4409167b9eb2 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 f8cc97f71cd0..33e447f98a54 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;
};
/*