Merge tag 'md/3.19' of git://neil.brown.name/md

[platform/kernel/linux-exynos.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index b97ac98..709755f 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);