1 files changed, 11 insertions, 11 deletions

diff --git a/fs/bio.c b/fs/bio.c
index 7bb281fc3d5c..8b7f14a95503 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -473,13 +473,13 @@ EXPORT_SYMBOL(bio_alloc_bioset);
 void zero_fill_bio(struct bio *bio)
 {
         unsigned long flags;
-        struct bio_vec *bv;
-        int i;
+        struct bio_vec bv;
+        struct bvec_iter iter;
 
-        bio_for_each_segment(bv, bio, i) {
-                char *data = bvec_kmap_irq(bv, &flags);
-                memset(data, 0, bv->bv_len);
-                flush_dcache_page(bv->bv_page);
+        bio_for_each_segment(bv, bio, iter) {
+                char *data = bvec_kmap_irq(&bv, &flags);
+                memset(data, 0, bv.bv_len);
+                flush_dcache_page(bv.bv_page);
                 bvec_kunmap_irq(data, &flags);
         }
 }
@@ -1687,11 +1687,11 @@ void bio_check_pages_dirty(struct bio *bio)
 #if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
 void bio_flush_dcache_pages(struct bio *bi)
 {
-        int i;
-        struct bio_vec *bvec;
+        struct bio_vec bvec;
+        struct bvec_iter iter;
 
-        bio_for_each_segment(bvec, bi, i)
-                flush_dcache_page(bvec->bv_page);
+        bio_for_each_segment(bvec, bi, iter)
+                flush_dcache_page(bvec.bv_page);
 }
 EXPORT_SYMBOL(bio_flush_dcache_pages);
 #endif
@@ -1840,7 +1840,7 @@ void bio_trim(struct bio *bio, int offset, int size)
                 bio->bi_iter.bi_idx = 0;
         }
         /* Make sure vcnt and last bv are not too big */
-        bio_for_each_segment(bvec, bio, i) {
+        bio_for_each_segment_all(bvec, bio, i) {
                 if (sofar + bvec->bv_len > size)
                         bvec->bv_len = size - sofar;
                 if (bvec->bv_len == 0) {