summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-11-06 23:29:47 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:53:30 -0800
commitbbdfc2f70610bebb841d0874dc901c648308e43a (patch)
tree0f78843b93bb3338ccd6dd36bd7d3677a97083e5 /fs
parentd10f2150eab62f633aeae36cf4612d1f648a817e (diff)
downloadop-kernel-dev-bbdfc2f70610bebb841d0874dc901c648308e43a.zip
op-kernel-dev-bbdfc2f70610bebb841d0874dc901c648308e43a.tar.gz
[SPLICE]: Don't assume regular pages in splice_to_pipe()
Allow caller to pass in a release function, there might be other resources that need releasing as well. Needed for network receive. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 56b802b..0a0b79b 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -254,11 +254,16 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
}
while (page_nr < spd_pages)
- page_cache_release(spd->pages[page_nr++]);
+ spd->spd_release(spd, page_nr++);
return ret;
}
+static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
+{
+ page_cache_release(spd->pages[i]);
+}
+
static int
__generic_file_splice_read(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
@@ -277,6 +282,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
.partial = partial,
.flags = flags,
.ops = &page_cache_pipe_buf_ops,
+ .spd_release = spd_release_page,
};
index = *ppos >> PAGE_CACHE_SHIFT;
@@ -1432,6 +1438,7 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
.partial = partial,
.flags = flags,
.ops = &user_page_pipe_buf_ops,
+ .spd_release = spd_release_page,
};
pipe = pipe_info(file->f_path.dentry->d_inode);
OpenPOWER on IntegriCloud