diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 14:35:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 14:35:57 -0700 |
| commit | 89fbf5384ddf666a595eb6562dc63fcbfeb8f6a5 (patch) | |
| tree | fc2de270b1dae61f850e9aff0784a672667e2acc /drivers/block | |
| parent | 4be95131bf3bca97b6a7db9c6fb63db2cb94da06 (diff) | |
| parent | a4058c5bce8aded1a12a59990e84e481a96fb490 (diff) | |
| download | linux-89fbf5384ddf666a595eb6562dc63fcbfeb8f6a5.tar.gz linux-89fbf5384ddf666a595eb6562dc63fcbfeb8f6a5.tar.bz2 linux-89fbf5384ddf666a595eb6562dc63fcbfeb8f6a5.zip | |
Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull read/write updates from Al Viro:
"Christoph's fs/read_write.c series - consolidation and cleanups"
* 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
nfsd: remove nfsd_vfs_read
nfsd: use vfs_iter_read/write
fs: implement vfs_iter_write using do_iter_write
fs: implement vfs_iter_read using do_iter_read
fs: move more code into do_iter_read/do_iter_write
fs: remove __do_readv_writev
fs: remove do_compat_readv_writev
fs: remove do_readv_writev
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/loop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 0de11444e317..ef8334949b42 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -273,7 +273,7 @@ static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos) iov_iter_bvec(&i, ITER_BVEC, bvec, 1, bvec->bv_len); file_start_write(file); - bw = vfs_iter_write(file, &i, ppos); + bw = vfs_iter_write(file, &i, ppos, 0); file_end_write(file); if (likely(bw == bvec->bv_len)) @@ -349,7 +349,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq, rq_for_each_segment(bvec, rq, iter) { iov_iter_bvec(&i, ITER_BVEC, &bvec, 1, bvec.bv_len); - len = vfs_iter_read(lo->lo_backing_file, &i, &pos); + len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0); if (len < 0) return len; @@ -390,7 +390,7 @@ static int lo_read_transfer(struct loop_device *lo, struct request *rq, b.bv_len = bvec.bv_len; iov_iter_bvec(&i, ITER_BVEC, &b, 1, b.bv_len); - len = vfs_iter_read(lo->lo_backing_file, &i, &pos); + len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0); if (len < 0) { ret = len; goto out_free_page; |