diff options
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index 56b802bfbfa4..0a0b79b01d05 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -254,11 +254,16 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, | |||
254 | } | 254 | } |
255 | 255 | ||
256 | while (page_nr < spd_pages) | 256 | while (page_nr < spd_pages) |
257 | page_cache_release(spd->pages[page_nr++]); | 257 | spd->spd_release(spd, page_nr++); |
258 | 258 | ||
259 | return ret; | 259 | return ret; |
260 | } | 260 | } |
261 | 261 | ||
262 | static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i) | ||
263 | { | ||
264 | page_cache_release(spd->pages[i]); | ||
265 | } | ||
266 | |||
262 | static int | 267 | static int |
263 | __generic_file_splice_read(struct file *in, loff_t *ppos, | 268 | __generic_file_splice_read(struct file *in, loff_t *ppos, |
264 | struct pipe_inode_info *pipe, size_t len, | 269 | struct pipe_inode_info *pipe, size_t len, |
@@ -277,6 +282,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, | |||
277 | .partial = partial, | 282 | .partial = partial, |
278 | .flags = flags, | 283 | .flags = flags, |
279 | .ops = &page_cache_pipe_buf_ops, | 284 | .ops = &page_cache_pipe_buf_ops, |
285 | .spd_release = spd_release_page, | ||
280 | }; | 286 | }; |
281 | 287 | ||
282 | index = *ppos >> PAGE_CACHE_SHIFT; | 288 | index = *ppos >> PAGE_CACHE_SHIFT; |
@@ -1432,6 +1438,7 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov, | |||
1432 | .partial = partial, | 1438 | .partial = partial, |
1433 | .flags = flags, | 1439 | .flags = flags, |
1434 | .ops = &user_page_pipe_buf_ops, | 1440 | .ops = &user_page_pipe_buf_ops, |
1441 | .spd_release = spd_release_page, | ||
1435 | }; | 1442 | }; |
1436 | 1443 | ||
1437 | pipe = pipe_info(file->f_path.dentry->d_inode); | 1444 | pipe = pipe_info(file->f_path.dentry->d_inode); |