diff options
| author |   Miklos Szeredi <mszeredi@redhat.com> | 2016-09-27 10:45:12 +0200 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2016-10-05 18:23:57 -0400 |
| commit | 7bf2d1df80822ec056363627e2014990f068f7aa (patch) | |
| tree | 27001759d32eb13264bb03453c24a59d43b0cb4b | |
| parent | relay: simplify relay_file_read() (diff) | |
| download | linux-dev-7bf2d1df80822ec056363627e2014990f068f7aa.tar.xz linux-dev-7bf2d1df80822ec056363627e2014990f068f7aa.zip | |
pipe: add pipe_buf_get() helper
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/fuse/dev.c | 2 | ||||
| -rw-r--r-- | fs/splice.c | 4 | ||||
| -rw-r--r-- | include/linux/pipe_fs_i.h | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 0a6a808d561c..b50220c75132 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1963,7 +1963,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1); pipe->nrbufs--; } else { - ibuf->ops->get(pipe, ibuf); + pipe_buf_get(pipe, ibuf); *obuf = *ibuf; obuf->flags &= ~PIPE_BUF_FLAG_GIFT; obuf->len = rem; diff --git a/fs/splice.c b/fs/splice.c index 0df907ba46ed..188a386bf379 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1596,7 +1596,7 @@ retry: * Get a reference to this pipe buffer, * so we can copy the contents over. */ - ibuf->ops->get(ipipe, ibuf); + pipe_buf_get(ipipe, ibuf); *obuf = *ibuf; /* @@ -1668,7 +1668,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, * Get a reference to this pipe buffer, * so we can copy the contents over. */ - ibuf->ops->get(ipipe, ibuf); + pipe_buf_get(ipipe, ibuf); obuf = opipe->bufs + nbuf; *obuf = *ibuf; diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 24f5470d3944..10876f3cb3da 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -115,6 +115,17 @@ struct pipe_buf_operations { void (*get)(struct pipe_inode_info *, struct pipe_buffer *); }; +/** + * pipe_buf_get - get a reference to a pipe_buffer + * @pipe: the pipe that the buffer belongs to + * @buf: the buffer to get a reference to + */ +static inline void pipe_buf_get(struct pipe_inode_info *pipe, + struct pipe_buffer *buf) +{ + buf->ops->get(pipe, buf); +} + /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual memory allocation, whereas PIPE_BUF makes atomicity guarantees. */ #define PIPE_SIZE PAGE_SIZE |