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/splice.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| download | linux-dev-46e678c96bbd775abd05d3ddbe2fd334794f9157.tar.xz linux-dev-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/splice.c')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index a46ddd28561e..9df28d30efa0 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -599,8 +599,10 @@ static int pipe_to_file(struct pipe_inode_info *info, struct pipe_buffer *buf, goto find_page; page = buf->page; - if (add_to_page_cache(page, mapping, index, gfp_mask)) + if (add_to_page_cache(page, mapping, index, gfp_mask)) { + unlock_page(page); goto find_page; + } if (!(buf->flags & PIPE_BUF_FLAG_LRU)) lru_cache_add(page); |