1 files changed, 8 insertions, 7 deletions

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index f785aef65799..b418cb0d7242 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -781,8 +781,8 @@ static void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
         if (!error && !bio_flagged(bio, BIO_UPTODATE))
                 error = EIO;
 
-        __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what,
-                        error, 0, NULL);
+        __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
+                        bio->bi_rw, what, error, 0, NULL);
 }
 
 static void blk_add_trace_bio_bounce(void *ignore,
@@ -885,8 +885,9 @@ static void blk_add_trace_split(void *ignore,
         if (bt) {
                 __be64 rpdu = cpu_to_be64(pdu);
 
-                __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw,
-                                BLK_TA_SPLIT, !bio_flagged(bio, BIO_UPTODATE),
+                __blk_add_trace(bt, bio->bi_iter.bi_sector,
+                                bio->bi_iter.bi_size, bio->bi_rw, BLK_TA_SPLIT,
+                                !bio_flagged(bio, BIO_UPTODATE),
                                 sizeof(rpdu), &rpdu);
         }
 }
@@ -918,9 +919,9 @@ static void blk_add_trace_bio_remap(void *ignore,
         r.device_to   = cpu_to_be32(bio->bi_bdev->bd_dev);
         r.sector_from = cpu_to_be64(from);
 
-        __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw,
-                        BLK_TA_REMAP, !bio_flagged(bio, BIO_UPTODATE),
-                        sizeof(r), &r);
+        __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size,
+                        bio->bi_rw, BLK_TA_REMAP,
+                        !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r);
 }
 
 /**