Merge tag 'for-5.2/block-20190507' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / fs / iomap.c

diff --git a/fs/iomap.c b/fs/iomap.c
index 9ef049d61e8ac79026dc4a9e8d49ee7d8d91d35e..23ef63fd166951e1c05f34875f661288fefb6ae7 100644 (file)
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -245,10 +245,9 @@ iomap_read_end_io(struct bio *bio)
 {
        int error = blk_status_to_errno(bio->bi_status);
        struct bio_vec *bvec;
-       int i;
        struct bvec_iter_all iter_all;
 
-       bio_for_each_segment_all(bvec, bio, i, iter_all)
+       bio_for_each_segment_all(bvec, bio, iter_all)
                iomap_read_page_end_io(bvec, error);
        bio_put(bio);
 }
@@ -1599,9 +1598,8 @@ static void iomap_dio_bio_end_io(struct bio *bio)
                if (!bio_flagged(bio, BIO_NO_PAGE_REF)) {
                        struct bvec_iter_all iter_all;
                        struct bio_vec *bvec;
-                       int i;
 
-                       bio_for_each_segment_all(bvec, bio, i, iter_all)
+                       bio_for_each_segment_all(bvec, bio, iter_all)
                                put_page(bvec->bv_page);
                }
                bio_put(bio);