1 files changed, 7 insertions, 6 deletions

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 0984232e429f..5cbd5d9ea61d 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -216,9 +216,10 @@ static int bio_integrity_process(struct bio *bio,
 {
         struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
         struct blk_integrity_iter iter;
-        struct bio_vec *bv;
+        struct bvec_iter bviter;
+        struct bio_vec bv;
         struct bio_integrity_payload *bip = bio_integrity(bio);
-        unsigned int i, ret = 0;
+        unsigned int ret = 0;
         void *prot_buf = page_address(bip->bip_vec->bv_page) +
                 bip->bip_vec->bv_offset;
 
@@ -227,11 +228,11 @@ static int bio_integrity_process(struct bio *bio,
         iter.seed = bip_get_seed(bip);
         iter.prot_buf = prot_buf;
 
-        bio_for_each_segment_all(bv, bio, i) {
-                void *kaddr = kmap_atomic(bv->bv_page);
+        bio_for_each_segment(bv, bio, bviter) {
+                void *kaddr = kmap_atomic(bv.bv_page);
 
-                iter.data_buf = kaddr + bv->bv_offset;
-                iter.data_size = bv->bv_len;
+                iter.data_buf = kaddr + bv.bv_offset;
+                iter.data_size = bv.bv_len;
 
                 ret = proc_fn(&iter);
                 if (ret) {