md: use generic io stats accounting functions to simplify io stat accounting

Use generic io stats accounting help functions (generic_{start,end}_io_acct)
to simplify io stat accounting.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 58f3927fd7cc98dda4113571fab3e607842e15f3..b1cdf69b11e75b301f9aadcb2d348f255e3bc941 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -602,13 +602,10 @@ static void end_io_acct(struct dm_io *io)
        struct mapped_device *md = io->md;
        struct bio *bio = io->bio;
        unsigned long duration = jiffies - io->start_time;
-       int pending, cpu;
+       int pending;
        int rw = bio_data_dir(bio);
 
-       cpu = part_stat_lock();
-       part_round_stats(cpu, &dm_disk(md)->part0);
-       part_stat_add(cpu, &dm_disk(md)->part0, ticks[rw], duration);
-       part_stat_unlock();
+       generic_end_io_acct(rw, &dm_disk(md)->part0, io->start_time);
 
        if (unlikely(dm_stats_used(&md->stats)))
                dm_stats_account_io(&md->stats, bio->bi_rw, bio->bi_iter.bi_sector,
@@ -1648,16 +1645,12 @@ static void _dm_request(struct request_queue *q, struct bio *bio)
 {
        int rw = bio_data_dir(bio);
        struct mapped_device *md = q->queuedata;
-       int cpu;
        int srcu_idx;
        struct dm_table *map;
 
        map = dm_get_live_table(md, &srcu_idx);
 
-       cpu = part_stat_lock();
-       part_stat_inc(cpu, &dm_disk(md)->part0, ios[rw]);
-       part_stat_add(cpu, &dm_disk(md)->part0, sectors[rw], bio_sectors(bio));
-       part_stat_unlock();
+       generic_start_io_acct(rw, bio_sectors(bio), &dm_disk(md)->part0);
 
        /* if we're suspended, we have to queue this io for later */
        if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags))) {

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9233c71138f18a62a4c175d7acf9c3b8fd03a3d5..056ccd28c037ba64f5a3a6e31da326b49be86ddb 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -247,7 +247,6 @@ static void md_make_request(struct request_queue *q, struct bio *bio)
 {
        const int rw = bio_data_dir(bio);
        struct mddev *mddev = q->queuedata;
-       int cpu;
        unsigned int sectors;
 
        if (mddev == NULL || mddev->pers == NULL
@@ -284,10 +283,7 @@ static void md_make_request(struct request_queue *q, struct bio *bio)
        sectors = bio_sectors(bio);
        mddev->pers->make_request(mddev, bio);
 
-       cpu = part_stat_lock();
-       part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);
-       part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw], sectors);
-       part_stat_unlock();
+       generic_start_io_acct(rw, sectors, &mddev->gendisk->part0);
 
        if (atomic_dec_and_test(&mddev->active_io) && mddev->suspended)
                wake_up(&mddev->sb_wait);