1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 3193aefe982b..e8b4574956c7 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -74,8 +74,8 @@ static void faulty_fail(struct bio *bio, int error)
 {
         struct bio *b = bio->bi_private;
 
-        b->bi_size = bio->bi_size;
-        b->bi_sector = bio->bi_sector;
+        b->bi_iter.bi_size = bio->bi_iter.bi_size;
+        b->bi_iter.bi_sector = bio->bi_iter.bi_sector;
 
         bio_put(bio);
 
@@ -185,26 +185,31 @@ static void make_request(struct mddev *mddev, struct bio *bio)
                         return;
                 }
 
-                if (check_sector(conf, bio->bi_sector, bio_end_sector(bio), WRITE))
+                if (check_sector(conf, bio->bi_iter.bi_sector,
+                                 bio_end_sector(bio), WRITE))
                         failit = 1;
                 if (check_mode(conf, WritePersistent)) {
-                        add_sector(conf, bio->bi_sector, WritePersistent);
+                        add_sector(conf, bio->bi_iter.bi_sector,
+                                   WritePersistent);
                         failit = 1;
                 }
                 if (check_mode(conf, WriteTransient))
                         failit = 1;
         } else {
                 /* read request */
-                if (check_sector(conf, bio->bi_sector, bio_end_sector(bio), READ))
+                if (check_sector(conf, bio->bi_iter.bi_sector,
+                                 bio_end_sector(bio), READ))
                         failit = 1;
                 if (check_mode(conf, ReadTransient))
                         failit = 1;
                 if (check_mode(conf, ReadPersistent)) {
-                        add_sector(conf, bio->bi_sector, ReadPersistent);
+                        add_sector(conf, bio->bi_iter.bi_sector,
+                                   ReadPersistent);
                         failit = 1;
                 }
                 if (check_mode(conf, ReadFixable)) {
-                        add_sector(conf, bio->bi_sector, ReadFixable);
+                        add_sector(conf, bio->bi_iter.bi_sector,
+                                   ReadFixable);
                         failit = 1;
                 }
         }