1 files changed, 6 insertions, 6 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 6024877335ca..1c04ec66974e 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2982,11 +2982,11 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh)
          * let it through, and the IO layer will turn it into
          * an EIO.
          */
-        if (unlikely(bio->bi_sector >= maxsector))
+        if (unlikely(bio->bi_iter.bi_sector >= maxsector))
                 return;
 
-        maxsector -= bio->bi_sector;
-        bytes = bio->bi_size;
+        maxsector -= bio->bi_iter.bi_sector;
+        bytes = bio->bi_iter.bi_size;
         if (likely((bytes >> 9) <= maxsector))
                 return;
 
@@ -2994,7 +2994,7 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh)
         bytes = maxsector << 9;
 
         /* Truncate the bio.. */
-        bio->bi_size = bytes;
+        bio->bi_iter.bi_size = bytes;
         bio->bi_io_vec[0].bv_len = bytes;
 
         /* ..and clear the end of the buffer for reads */
@@ -3029,14 +3029,14 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
          */
         bio = bio_alloc(GFP_NOIO, 1);
 
-        bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9);
+        bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
         bio->bi_bdev = bh->b_bdev;
         bio->bi_io_vec[0].bv_page = bh->b_page;
         bio->bi_io_vec[0].bv_len = bh->b_size;
         bio->bi_io_vec[0].bv_offset = bh_offset(bh);
 
         bio->bi_vcnt = 1;
-        bio->bi_size = bh->b_size;
+        bio->bi_iter.bi_size = bh->b_size;
 
         bio->bi_end_io = end_bio_bh_io_sync;
         bio->bi_private = bh;