dm: use bio_{start,end}_io_acct

Switch dm to use the nicer bio accounting helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f215b86664484fde89de28d37c5565b9ea78b941..3f39fa1ac756ef729f195570b50e84fbd5af4b38 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -681,11 +681,7 @@ static void start_io_acct(struct dm_io *io)
        struct mapped_device *md = io->md;
        struct bio *bio = io->orig_bio;
 
-       io->start_time = jiffies;
-
-       generic_start_io_acct(md->queue, bio_op(bio), bio_sectors(bio),
-                             &dm_disk(md)->part0);
-
+       io->start_time = bio_start_io_acct(bio);
        if (unlikely(dm_stats_used(&md->stats)))
                dm_stats_account_io(&md->stats, bio_data_dir(bio),
                                    bio->bi_iter.bi_sector, bio_sectors(bio),
@@ -698,8 +694,7 @@ static void end_io_acct(struct dm_io *io)
        struct bio *bio = io->orig_bio;
        unsigned long duration = jiffies - io->start_time;
 
-       generic_end_io_acct(md->queue, bio_op(bio), &dm_disk(md)->part0,
-                           io->start_time);
+       bio_end_io_acct(bio, io->start_time);
 
        if (unlikely(dm_stats_used(&md->stats)))
                dm_stats_account_io(&md->stats, bio_data_dir(bio),