summaryrefslogtreecommitdiffstats
path: root/fs/pipe.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-04-02 23:11:04 +0200
committerJens Axboe <axboe@suse.de>2006-04-02 23:11:04 +0200
commit3e7ee3e7b36fa4e2d88d8fb0a2577be95fc4636d (patch)
tree46e972e78122f8a719dafc87572bffb25716e745 /fs/pipe.c
parent[PATCH] splice: page stealing needs to wait_on_page_writeback() (diff)
downloadlinux-3e7ee3e7b36fa4e2d88d8fb0a2577be95fc4636d.tar.xz
linux-3e7ee3e7b36fa4e2d88d8fb0a2577be95fc4636d.zip
[PATCH] splice: fix page stealing LRU handling.
Originally from Nick Piggin, just adapted to the newer branch. You can't check PageLRU without holding zone->lru_lock. The page release code can get away with it only because the page refcount is 0 at that point. Also, you can't reliably remove pages from the LRU unless the refcount is 0. Ever. Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r--fs/pipe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 5093408746b8..795df987cd38 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -95,6 +95,8 @@ static void anon_pipe_buf_release(struct pipe_inode_info *info, struct pipe_buff
{
struct page *page = buf->page;
+ buf->flags &= ~PIPE_BUF_FLAG_STOLEN;
+
/*
* If nobody else uses this page, and we don't already have a
* temporary page, let's keep track of it as a one-deep
@@ -124,6 +126,7 @@ static void anon_pipe_buf_unmap(struct pipe_inode_info *info, struct pipe_buffer
static int anon_pipe_buf_steal(struct pipe_inode_info *info,
struct pipe_buffer *buf)
{
+ buf->flags |= PIPE_BUF_FLAG_STOLEN;
return 0;
}