diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /fs/pipe.c | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 7 |
1 files changed, 7 insertions, 0 deletions
| @@ -131,12 +131,19 @@ static int anon_pipe_buf_steal(struct pipe_inode_info *pipe, | |||
| 131 | return 0; | 131 | return 0; |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | static void anon_pipe_buf_get(struct pipe_inode_info *info, | ||
| 135 | struct pipe_buffer *buf) | ||
| 136 | { | ||
| 137 | page_cache_get(buf->page); | ||
| 138 | } | ||
| 139 | |||
| 134 | static struct pipe_buf_operations anon_pipe_buf_ops = { | 140 | static struct pipe_buf_operations anon_pipe_buf_ops = { |
| 135 | .can_merge = 1, | 141 | .can_merge = 1, |
| 136 | .map = anon_pipe_buf_map, | 142 | .map = anon_pipe_buf_map, |
| 137 | .unmap = anon_pipe_buf_unmap, | 143 | .unmap = anon_pipe_buf_unmap, |
| 138 | .release = anon_pipe_buf_release, | 144 | .release = anon_pipe_buf_release, |
| 139 | .steal = anon_pipe_buf_steal, | 145 | .steal = anon_pipe_buf_steal, |
| 146 | .get = anon_pipe_buf_get, | ||
| 140 | }; | 147 | }; |
| 141 | 148 | ||
| 142 | static ssize_t | 149 | static ssize_t |
