diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /fs/pipe.c | |
parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -95,6 +95,8 @@ static void anon_pipe_buf_release(struct pipe_inode_info *info, struct pipe_buff | |||
95 | { | 95 | { |
96 | struct page *page = buf->page; | 96 | struct page *page = buf->page; |
97 | 97 | ||
98 | buf->flags &= ~PIPE_BUF_FLAG_STOLEN; | ||
99 | |||
98 | /* | 100 | /* |
99 | * If nobody else uses this page, and we don't already have a | 101 | * If nobody else uses this page, and we don't already have a |
100 | * temporary page, let's keep track of it as a one-deep | 102 | * temporary page, let's keep track of it as a one-deep |
@@ -124,7 +126,7 @@ static void anon_pipe_buf_unmap(struct pipe_inode_info *info, struct pipe_buffer | |||
124 | static int anon_pipe_buf_steal(struct pipe_inode_info *info, | 126 | static int anon_pipe_buf_steal(struct pipe_inode_info *info, |
125 | struct pipe_buffer *buf) | 127 | struct pipe_buffer *buf) |
126 | { | 128 | { |
127 | buf->stolen = 1; | 129 | buf->flags |= PIPE_BUF_FLAG_STOLEN; |
128 | return 0; | 130 | return 0; |
129 | } | 131 | } |
130 | 132 | ||