aboutsummaryrefslogtreecommitdiffstats
path: root/fs/pipe.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-06-14 07:10:48 -0400
committerJens Axboe <jens.axboe@oracle.com>2007-07-10 02:04:15 -0400
commitcac36bb06efe4880234524e117e0e712b10b1f16 (patch)
tree5220c6f2185cee1c6934cf8048975beac5bc94bb /fs/pipe.c
parentd96e6e71647846e0dab097efd9b8bf3a3a556dca (diff)
pipe: change the ->pin() operation to ->confirm()
The name 'pin' was badly chosen, it doesn't pin a pipe buffer in the most commonly used sense in the kernel. So change the name to 'confirm', after debating this issue with Hugh Dickins a bit. A good return from ->confirm() means that the buffer is really there, and that the contents are good. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r--fs/pipe.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index 3a89592bdf57..3694af10dd2c 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -203,7 +203,8 @@ void generic_pipe_buf_get(struct pipe_inode_info *info, struct pipe_buffer *buf)
203 page_cache_get(buf->page); 203 page_cache_get(buf->page);
204} 204}
205 205
206int generic_pipe_buf_pin(struct pipe_inode_info *info, struct pipe_buffer *buf) 206int generic_pipe_buf_confirm(struct pipe_inode_info *info,
207 struct pipe_buffer *buf)
207{ 208{
208 return 0; 209 return 0;
209} 210}
@@ -212,7 +213,7 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = {
212 .can_merge = 1, 213 .can_merge = 1,
213 .map = generic_pipe_buf_map, 214 .map = generic_pipe_buf_map,
214 .unmap = generic_pipe_buf_unmap, 215 .unmap = generic_pipe_buf_unmap,
215 .pin = generic_pipe_buf_pin, 216 .confirm = generic_pipe_buf_confirm,
216 .release = anon_pipe_buf_release, 217 .release = anon_pipe_buf_release,
217 .steal = generic_pipe_buf_steal, 218 .steal = generic_pipe_buf_steal,
218 .get = generic_pipe_buf_get, 219 .get = generic_pipe_buf_get,
@@ -252,7 +253,7 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
252 if (chars > total_len) 253 if (chars > total_len)
253 chars = total_len; 254 chars = total_len;
254 255
255 error = ops->pin(pipe, buf); 256 error = ops->confirm(pipe, buf);
256 if (error) { 257 if (error) {
257 if (!ret) 258 if (!ret)
258 error = ret; 259 error = ret;
@@ -373,7 +374,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
373 int error, atomic = 1; 374 int error, atomic = 1;
374 void *addr; 375 void *addr;
375 376
376 error = ops->pin(pipe, buf); 377 error = ops->confirm(pipe, buf);
377 if (error) 378 if (error)
378 goto out; 379 goto out;
379 380