summaryrefslogtreecommitdiffstats
path: root/drivers/block/loop.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-05-27 04:16:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-06-29 17:49:23 -0400
commit18e9710ee59ce3bd2a2512ddcd3f7ceebe8b8d17 (patch)
treea09b5ebcb9460ad374b798258b8f46dd370cad88 /drivers/block/loop.c
parentedab5fe38c2c17a7d7ea5f82e1d9503bfc79a8ac (diff)
fs: implement vfs_iter_read using do_iter_read
De-dupliate some code and allow for passing the flags argument to vfs_iter_read. Additional it properly updates atime now. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r--drivers/block/loop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index ebbd0c3fe0ed..b64649bec64e 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -342,7 +342,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq,
342 342
343 rq_for_each_segment(bvec, rq, iter) { 343 rq_for_each_segment(bvec, rq, iter) {
344 iov_iter_bvec(&i, ITER_BVEC, &bvec, 1, bvec.bv_len); 344 iov_iter_bvec(&i, ITER_BVEC, &bvec, 1, bvec.bv_len);
345 len = vfs_iter_read(lo->lo_backing_file, &i, &pos); 345 len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
346 if (len < 0) 346 if (len < 0)
347 return len; 347 return len;
348 348
@@ -383,7 +383,7 @@ static int lo_read_transfer(struct loop_device *lo, struct request *rq,
383 b.bv_len = bvec.bv_len; 383 b.bv_len = bvec.bv_len;
384 384
385 iov_iter_bvec(&i, ITER_BVEC, &b, 1, b.bv_len); 385 iov_iter_bvec(&i, ITER_BVEC, &b, 1, b.bv_len);
386 len = vfs_iter_read(lo->lo_backing_file, &i, &pos); 386 len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
387 if (len < 0) { 387 if (len < 0) {
388 ret = len; 388 ret = len;
389 goto out_free_page; 389 goto out_free_page;