1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index a5d9c0ee4d60..bef353c51c04 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -937,9 +937,9 @@ static struct dma_async_tx_descriptor *
 async_copy_data(int frombio, struct bio *bio, struct page *page,
         sector_t sector, struct dma_async_tx_descriptor *tx)
 {
-        struct bio_vec *bvl;
+        struct bio_vec bvl;
+        struct bvec_iter iter;
         struct page *bio_page;
-        int i;
         int page_offset;
         struct async_submit_ctl submit;
         enum async_tx_flags flags = 0;
@@ -953,8 +953,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page,
                 flags |= ASYNC_TX_FENCE;
         init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
 
-        bio_for_each_segment(bvl, bio, i) {
-                int len = bvl->bv_len;
+        bio_for_each_segment(bvl, bio, iter) {
+                int len = bvl.bv_len;
                 int clen;
                 int b_offset = 0;
 
@@ -970,8 +970,8 @@ async_copy_data(int frombio, struct bio *bio, struct page *page,
                         clen = len;
 
                 if (clen > 0) {
-                        b_offset += bvl->bv_offset;
-                        bio_page = bvl->bv_page;
+                        b_offset += bvl.bv_offset;
+                        bio_page = bvl.bv_page;
                         if (frombio)
                                 tx = async_memcpy(page, bio_page, page_offset,
                                                   b_offset, clen, &submit);