lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tmpfs: clone shmem_file_splice_read()

Browse Source 
Copy __generic_file_splice_read() and generic_file_splice_read() from
fs/splice.c to shmem_file_splice_read() in mm/shmem.c.  Make
page_cache_pipe_buf_ops and spd_release_page() accessible to it.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins
2011-07-25 17:12:32 -07:00
committed by Linus Torvalds
parent 2efaca927f
commit 708e3508c2
3 changed files with 221 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/splice.c
View File

@@ -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]);
}