Merge branch 'for-5.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

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

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 40e845f..07119d7 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -297,6 +297,8 @@ static void raid_end_bio_io(struct r10bio *r10_bio)
        if (!test_bit(R10BIO_Uptodate, &r10_bio->state))
                bio->bi_status = BLK_STS_IOERR;
 
+       if (blk_queue_io_stat(bio->bi_bdev->bd_disk->queue))
+               bio_end_io_acct(bio, r10_bio->start_time);
        bio_endio(bio);
        /*
         * Wake up any possible resync thread that waits for the device
@@ -1184,6 +1186,8 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
        }
        slot = r10_bio->read_slot;
 
+       if (blk_queue_io_stat(bio->bi_bdev->bd_disk->queue))
+               r10_bio->start_time = bio_start_io_acct(bio);
        read_bio = bio_clone_fast(bio, gfp, &mddev->bio_set);
 
        r10_bio->devs[slot].bio = read_bio;
@@ -1483,6 +1487,8 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,
                r10_bio->master_bio = bio;
        }
 
+       if (blk_queue_io_stat(bio->bi_bdev->bd_disk->queue))
+               r10_bio->start_time = bio_start_io_acct(bio);
        atomic_set(&r10_bio->remaining, 1);
        md_bitmap_startwrite(mddev->bitmap, r10_bio->sector, r10_bio->sectors, 0);