diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-01-25 21:11:59 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-01-29 00:13:13 -0500 |
| commit | dbe4e192a234cd6133d86fffb965d0f032c12ccc (patch) | |
| tree | e5b5bbc9b22a289ec33fbc808f7e81d926caec06 /fs/splice.c | |
| parent | 05afcb77eb4713f46e7ebaa3cb54bc465c5d516e (diff) | |
| download | op-kernel-dev-dbe4e192a234cd6133d86fffb965d0f032c12ccc.zip op-kernel-dev-dbe4e192a234cd6133d86fffb965d0f032c12ccc.tar.gz | |
fs: add vfs_iter_{read,write} helpers
Simple helpers that pass an arbitrary iov_iter to filesystems.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/fs/splice.c b/fs/splice.c index 7c7176f..7968da9 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -961,7 +961,6 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, splice_from_pipe_begin(&sd); while (sd.total_len) { struct iov_iter from; - struct kiocb kiocb; size_t left; int n, idx; @@ -1005,26 +1004,15 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, left -= this_len; } - /* ... iov_iter */ iov_iter_bvec(&from, ITER_BVEC | WRITE, array, n, sd.total_len - left); - - /* ... and iocb */ - init_sync_kiocb(&kiocb, out); - kiocb.ki_pos = sd.pos; - kiocb.ki_nbytes = sd.total_len - left; - - /* now, send it */ - ret = out->f_op->write_iter(&kiocb, &from); - if (-EIOCBQUEUED == ret) - ret = wait_on_sync_kiocb(&kiocb); - + ret = vfs_iter_write(out, &from, &sd.pos); if (ret <= 0) break; sd.num_spliced += ret; sd.total_len -= ret; - *ppos = sd.pos = kiocb.ki_pos; + *ppos = sd.pos; /* dismiss the fully eaten buffers, adjust the partial one */ while (ret) { |
