1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 000abe2f105c..6b29c4422828 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2351,7 +2351,7 @@ static void rw_interrupt(void)
 /* Compute maximal contiguous buffer size. */
 static int buffer_chain_size(void)
 {
-        struct bio_vec *bv;
+        struct bio_vec bv;
         int size;
         struct req_iterator iter;
         char *base;
@@ -2360,10 +2360,10 @@ static int buffer_chain_size(void)
         size = 0;
 
         rq_for_each_segment(bv, current_req, iter) {
-                if (page_address(bv->bv_page) + bv->bv_offset != base + size)
+                if (page_address(bv.bv_page) + bv.bv_offset != base + size)
                         break;
 
-                size += bv->bv_len;
+                size += bv.bv_len;
         }
 
         return size >> 9;
@@ -2389,7 +2389,7 @@ static int transfer_size(int ssize, int max_sector, int max_size)
 static void copy_buffer(int ssize, int max_sector, int max_sector_2)
 {
         int remaining;          /* number of transferred 512-byte sectors */
-        struct bio_vec *bv;
+        struct bio_vec bv;
         char *buffer;
         char *dma_buffer;
         int size;
@@ -2427,10 +2427,10 @@ static void copy_buffer(int ssize, int max_sector, int max_sector_2)
                 if (!remaining)
                         break;
 
-                size = bv->bv_len;
+                size = bv.bv_len;
                 SUPBOUND(size, remaining);
 
-                buffer = page_address(bv->bv_page) + bv->bv_offset;
+                buffer = page_address(bv.bv_page) + bv.bv_offset;
                 if (dma_buffer + size >
                     floppy_track_buffer + (max_buffer_sectors << 10) ||
                     dma_buffer < floppy_track_buffer) {
@@ -3775,9 +3775,9 @@ static int __floppy_read_block_0(struct block_device *bdev)
         bio_vec.bv_len = size;
         bio_vec.bv_offset = 0;
         bio.bi_vcnt = 1;
-        bio.bi_size = size;
+        bio.bi_iter.bi_size = size;
         bio.bi_bdev = bdev;
-        bio.bi_sector = 0;
+        bio.bi_iter.bi_sector = 0;
         bio.bi_flags = (1 << BIO_QUIET);
         init_completion(&complete);
         bio.bi_private = &complete;