new helper: iov_iter_bvec()
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 23 Jan 2015 06:08:07 +0000 (01:08 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 29 Jan 2015 05:13:11 +0000 (00:13 -0500)
similar to iov_iter_kvec(), for ITER_BVEC ones

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/splice.c
include/linux/uio.h
mm/iov_iter.c
mm/page_io.c

index 75c6058..7c7176f 100644 (file)
@@ -1006,11 +1006,8 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
                }
 
                /* ... iov_iter */
-               from.type = ITER_BVEC | WRITE;
-               from.bvec = array;
-               from.nr_segs = n;
-               from.count = sd.total_len - left;
-               from.iov_offset = 0;
+               iov_iter_bvec(&from, ITER_BVEC | WRITE, array, n,
+                             sd.total_len - left);
 
                /* ... and iocb */
                init_sync_kiocb(&kiocb, out);
Simple merge
diff --cc mm/iov_iter.c
Simple merge
diff --cc mm/page_io.c
Simple merge