Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md...

[sfrench/cifs-2.6.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4f9b5827355e51de20bd78e86212da00d9b51d3b..fd4af4de03b40117c98a4584bf0c4b7eedd3dba9 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -334,7 +334,6 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
        const int sgrp = op_stat_group(bio_op(bio));
        struct mddev *mddev = q->queuedata;
        unsigned int sectors;
-       int cpu;
 
        blk_queue_split(q, &bio);
 
@@ -359,9 +358,9 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
 
        md_handle_request(mddev, bio);
 
-       cpu = part_stat_lock();
-       part_stat_inc(cpu, &mddev->gendisk->part0, ios[sgrp]);
-       part_stat_add(cpu, &mddev->gendisk->part0, sectors[sgrp], sectors);
+       part_stat_lock();
+       part_stat_inc(&mddev->gendisk->part0, ios[sgrp]);
+       part_stat_add(&mddev->gendisk->part0, sectors[sgrp], sectors);
        part_stat_unlock();
 
        return BLK_QC_T_NONE;