[PATCH] splice: fix bugs in pipe_to_file()

[linux-2.6] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 7fefb10db8d9d6ad2a187d3c352cd0557beb30f5..888f265011bf46b539510d8f9ffa13a5eb844c7f 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -99,8 +99,6 @@ static void anon_pipe_buf_release(struct pipe_inode_info *pipe,
 {
        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
@@ -127,8 +125,14 @@ 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) {
+               lock_page(page);
+               return 0;
+       }
+
+       return 1;
 }
 
 static void anon_pipe_buf_get(struct pipe_inode_info *info,