diff options
| author | Jens Axboe <axboe@suse.de> | 2006-04-30 16:36:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@suse.de> | 2006-04-30 16:36:32 +0200 |
| commit | 46e678c96bbd775abd05d3ddbe2fd334794f9157 (patch) | |
| tree | f82b77d9f2fd5d4eb5e66bc2bb8ff5df63db3c7f /fs/pipe.c | |
| parent | e0a515bc6a2188f02916e976f419a8640312e32a (diff) | |
| download | linux-3.10-46e678c96bbd775abd05d3ddbe2fd334794f9157.tar.gz linux-3.10-46e678c96bbd775abd05d3ddbe2fd334794f9157.tar.bz2 linux-3.10-46e678c96bbd775abd05d3ddbe2fd334794f9157.zip | |
[PATCH] splice: fix bugs with stealing regular pipe pages
- Check that page has suitable count for stealing in the regular pipes.
- pipe_to_file() assumes that the page is locked on succesful steal, so
do that in the pipe steal hook
- Missing unlock_page() in add_to_page_cache() failure.
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 7fefb10db8d..5a369273c51 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -127,8 +127,15 @@ static void anon_pipe_buf_unmap(struct pipe_inode_info *pipe, static int anon_pipe_buf_steal(struct pipe_inode_info *pipe, struct pipe_buffer *buf) { - buf->flags |= PIPE_BUF_FLAG_STOLEN; - return 0; + struct page *page = buf->page; + + if (page_count(page) == 1) { + buf->flags |= PIPE_BUF_FLAG_STOLEN; + lock_page(page); + return 0; + } + + return 1; } static void anon_pipe_buf_get(struct pipe_inode_info *info, |