block: remove the i argument to bio_for_each_segment_all

We only have two callers that need the integer loop iterator, and they
can easily maintain it themselves.

Suggested-by: Matthew Wilcox <willy@infradead.org>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Acked-by: David Sterba <dsterba@suse.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Acked-by: Coly Li <colyli@suse.de>
Reviewed-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 82fdda8ff5ab..10a8d08d3d29 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7828,7 +7828,6 @@ static void btrfs_retry_endio_nocsum(struct bio *bio)
         struct inode *inode = done->inode;
         struct bio_vec *bvec;
         struct extent_io_tree *io_tree, *failure_tree;
-        int i;
         struct bvec_iter_all iter_all;
 
         if (bio->bi_status)
@@ -7841,7 +7840,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio)
 
         done->uptodate = 1;
         ASSERT(!bio_flagged(bio, BIO_CLONED));
-        bio_for_each_segment_all(bvec, bio, i, iter_all)
+        bio_for_each_segment_all(bvec, bio, iter_all)
                 clean_io_failure(BTRFS_I(inode)->root->fs_info, failure_tree,
                                  io_tree, done->start, bvec->bv_page,
                                  btrfs_ino(BTRFS_I(inode)), 0);
@@ -7919,7 +7918,7 @@ static void btrfs_retry_endio(struct bio *bio)
         struct bio_vec *bvec;
         int uptodate;
         int ret;
-        int i;
+        int i = 0;
         struct bvec_iter_all iter_all;
 
         if (bio->bi_status)
@@ -7934,7 +7933,7 @@ static void btrfs_retry_endio(struct bio *bio)
         failure_tree = &BTRFS_I(inode)->io_failure_tree;
 
         ASSERT(!bio_flagged(bio, BIO_CLONED));
-        bio_for_each_segment_all(bvec, bio, i, iter_all) {
+        bio_for_each_segment_all(bvec, bio, iter_all) {
                 ret = __readpage_endio_check(inode, io_bio, i, bvec->bv_page,
                                              bvec->bv_offset, done->start,
                                              bvec->bv_len);
@@ -7946,6 +7945,7 @@ static void btrfs_retry_endio(struct bio *bio)
                                          bvec->bv_offset);
                 else
                         uptodate = 0;
+                i++;
         }
 
         done->uptodate = uptodate;