diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-26 21:46:20 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-26 21:46:20 -0700 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /fs/splice.c | |
| parent | d6069dae4700cf5290a75002c46b9be8ea7eef3c (diff) | |
| parent | 3f48e7354358519e5b93f7f755ec270b3f8eafa0 (diff) | |
| download | linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.bz2 | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index aa866d309695..fa2defa8afcf 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -132,7 +132,7 @@ error: return err; } -static const struct pipe_buf_operations page_cache_pipe_buf_ops = { +const struct pipe_buf_operations page_cache_pipe_buf_ops = { .can_merge = 0, .map = generic_pipe_buf_map, .unmap = generic_pipe_buf_unmap, @@ -264,7 +264,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe, return ret; } -static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i) +void spd_release_page(struct splice_pipe_desc *spd, unsigned int i) { page_cache_release(spd->pages[i]); } |