Merge tag 'acpi-5.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / md / raid1.c

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 960d854..c034799 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1305,8 +1305,8 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
        read_bio->bi_private = r1_bio;
 
        if (mddev->gendisk)
-               trace_block_bio_remap(read_bio->bi_disk->queue, read_bio,
-                               disk_devt(mddev->gendisk), r1_bio->sector);
+               trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
+                                     r1_bio->sector);
 
        submit_bio_noacct(read_bio);
 }
@@ -1517,8 +1517,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                atomic_inc(&r1_bio->remaining);
 
                if (mddev->gendisk)
-                       trace_block_bio_remap(mbio->bi_disk->queue,
-                                             mbio, disk_devt(mddev->gendisk),
+                       trace_block_bio_remap(mbio, disk_devt(mddev->gendisk),
                                              r1_bio->sector);
                /* flush_pending_writes() needs access to the rdev so...*/
                mbio->bi_disk = (void *)conf->mirrors[i].rdev;