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:58 -0400 |
| commit | a779638cf622f069a484e8802134cca3c6c71415 (patch) | |
| tree | a9eb77b635e86421465f6e06d1e29bc406cfdc8c /fs/splice.c | |
| parent | 7bf2d1df80822ec056363627e2014990f068f7aa (diff) | |
| download | linux-stable-a779638cf622f069a484e8802134cca3c6c71415.tar.gz linux-stable-a779638cf622f069a484e8802134cca3c6c71415.tar.bz2 linux-stable-a779638cf622f069a484e8802134cca3c6c71415.zip | |
pipe: add pipe_buf_release() helper
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/fs/splice.c b/fs/splice.c index 188a386bf379..ae90cd1d2999 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -238,8 +238,7 @@ ssize_t add_to_pipe(struct pipe_inode_info *pipe, struct pipe_buffer *buf) pipe->nrbufs++; return buf->len; } - buf->ops->release(pipe, buf); - buf->ops = NULL; + pipe_buf_release(pipe, buf); return ret; } EXPORT_SYMBOL(add_to_pipe); @@ -516,7 +515,6 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des while (pipe->nrbufs) { struct pipe_buffer *buf = pipe->bufs + pipe->curbuf; - const struct pipe_buf_operations *ops = buf->ops; sd->len = buf->len; if (sd->len > sd->total_len) @@ -542,8 +540,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des sd->total_len -= ret; if (!buf->len) { - buf->ops = NULL; - ops->release(pipe, buf); + pipe_buf_release(pipe, buf); pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1); pipe->nrbufs--; if (pipe->files) @@ -789,11 +786,9 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, while (ret) { struct pipe_buffer *buf = pipe->bufs + pipe->curbuf; if (ret >= buf->len) { - const struct pipe_buf_operations *ops = buf->ops; ret -= buf->len; buf->len = 0; - buf->ops = NULL; - ops->release(pipe, buf); + pipe_buf_release(pipe, buf); pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1); pipe->nrbufs--; if (pipe->files) @@ -1032,10 +1027,8 @@ out_release: for (i = 0; i < pipe->buffers; i++) { struct pipe_buffer *buf = pipe->bufs + i; - if (buf->ops) { - buf->ops->release(pipe, buf); - buf->ops = NULL; - } + if (buf->ops) + pipe_buf_release(pipe, buf); } if (!bytes) |