8 files changed, 53 insertions, 32 deletions

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 84c03d65dcc5..17eed8c025d0 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -756,16 +756,17 @@ diskstats(struct gendisk *disk, struct bio *bio, ulong duration, sector_t sector
         unsigned long n_sect = bio->bi_size >> 9;
         const int rw = bio_data_dir(bio);
         struct hd_struct *part;
+        int cpu;
 
-        rcu_read_lock();
-
+        cpu = disk_stat_lock();
         part = disk_map_sector_rcu(disk, sector);
-        all_stat_inc(disk, part, ios[rw], sector);
-        all_stat_add(disk, part, ticks[rw], duration, sector);
-        all_stat_add(disk, part, sectors[rw], n_sect, sector);
-        all_stat_add(disk, part, io_ticks, duration, sector);
 
-        rcu_read_unlock();
+        all_stat_inc(cpu, disk, part, ios[rw], sector);
+        all_stat_add(cpu, disk, part, ticks[rw], duration, sector);
+        all_stat_add(cpu, disk, part, sectors[rw], n_sect, sector);
+        all_stat_add(cpu, disk, part, io_ticks, duration, sector);
+
+        disk_stat_unlock();
 }
 
 void
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index a78caad29996..653624792eaf 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -377,12 +377,13 @@ static void free_tio(struct mapped_device *md, struct dm_target_io *tio)
 static void start_io_acct(struct dm_io *io)
 {
         struct mapped_device *md = io->md;
+        int cpu;
 
         io->start_time = jiffies;
 
-        preempt_disable();
-        disk_round_stats(dm_disk(md));
-        preempt_enable();
+        cpu = disk_stat_lock();
+        disk_round_stats(cpu, dm_disk(md));
+        disk_stat_unlock();
         dm_disk(md)->in_flight = atomic_inc_return(&md->pending);
 }
 
@@ -391,15 +392,15 @@ static int 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;
+        int pending, cpu;
         int rw = bio_data_dir(bio);
 
-        preempt_disable();
-        disk_round_stats(dm_disk(md));
-        preempt_enable();
-        dm_disk(md)->in_flight = pending = atomic_dec_return(&md->pending);
+        cpu = disk_stat_lock();
+        disk_round_stats(cpu, dm_disk(md));
+        disk_stat_add(cpu, dm_disk(md), ticks[rw], duration);
+        disk_stat_unlock();
 
-        disk_stat_add(dm_disk(md), ticks[rw], duration);
+        dm_disk(md)->in_flight = pending = atomic_dec_return(&md->pending);
 
         return !pending;
 }
@@ -885,6 +886,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)
         int r = -EIO;
         int rw = bio_data_dir(bio);
         struct mapped_device *md = q->queuedata;
+        int cpu;
 
         /*
          * There is no use in forwarding any barrier request since we can't
@@ -897,8 +899,10 @@ static int dm_request(struct request_queue *q, struct bio *bio)
 
         down_read(&md->io_lock);
 
-        disk_stat_inc(dm_disk(md), ios[rw]);
-        disk_stat_add(dm_disk(md), sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, dm_disk(md), ios[rw]);
+        disk_stat_add(cpu, dm_disk(md), sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         /*
          * If we're suspended we have to queue
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b1eebf88c209..00cbc8e47294 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -318,14 +318,17 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)
         mddev_t *mddev = q->queuedata;
         dev_info_t *tmp_dev;
         sector_t block;
+        int cpu;
 
         if (unlikely(bio_barrier(bio))) {
                 bio_endio(bio, -EOPNOTSUPP);
                 return 0;
         }
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         tmp_dev = which_dev(mddev, bio->bi_sector);
         block = bio->bi_sector >> 1;
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index c4779ccba1c3..182f5a94cdc5 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -147,6 +147,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
         struct multipath_bh * mp_bh;
         struct multipath_info *multipath;
         const int rw = bio_data_dir(bio);
+        int cpu;
 
         if (unlikely(bio_barrier(bio))) {
                 bio_endio(bio, -EOPNOTSUPP);
@@ -158,8 +159,10 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
         mp_bh->master_bio = bio;
         mp_bh->mddev = mddev;
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         mp_bh->path = multipath_map(conf);
         if (mp_bh->path < 0) {
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 183610635661..e26030fa59ab 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -399,14 +399,17 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)
         sector_t chunk;
         sector_t block, rsect;
         const int rw = bio_data_dir(bio);
+        int cpu;
 
         if (unlikely(bio_barrier(bio))) {
                 bio_endio(bio, -EOPNOTSUPP);
                 return 0;
         }
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         chunk_size = mddev->chunk_size >> 10;
         chunk_sects = mddev->chunk_size >> 9;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 0b82030c265d..babb13036f93 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -779,7 +779,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
         struct page **behind_pages = NULL;
         const int rw = bio_data_dir(bio);
         const int do_sync = bio_sync(bio);
-        int do_barriers;
+        int cpu, do_barriers;
         mdk_rdev_t *blocked_rdev;
 
         /*
@@ -804,8 +804,10 @@ static int make_request(struct request_queue *q, struct bio * bio)
 
         bitmap = mddev->bitmap;
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         /*
          * make_request() can abort the operation when READA is being
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index d3b9aa096285..5ec80da0a9d7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -789,6 +789,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
         mirror_info_t *mirror;
         r10bio_t *r10_bio;
         struct bio *read_bio;
+        int cpu;
         int i;
         int chunk_sects = conf->chunk_mask + 1;
         const int rw = bio_data_dir(bio);
@@ -843,8 +844,10 @@ static int make_request(struct request_queue *q, struct bio * bio)
          */
         wait_barrier(conf);
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bio));
+        disk_stat_unlock();
 
         r10_bio = mempool_alloc(conf->r10bio_pool, GFP_NOIO);
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 37e546528f9c..5899f211515f 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3387,7 +3387,7 @@ static int make_request(struct request_queue *q, struct bio * bi)
         sector_t logical_sector, last_sector;
         struct stripe_head *sh;
         const int rw = bio_data_dir(bi);
-        int remaining;
+        int cpu, remaining;
 
         if (unlikely(bio_barrier(bi))) {
                 bio_endio(bi, -EOPNOTSUPP);
@@ -3396,8 +3396,10 @@ static int make_request(struct request_queue *q, struct bio * bi)
 
         md_write_start(mddev, bi);
 
-        disk_stat_inc(mddev->gendisk, ios[rw]);
-        disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bi));
+        cpu = disk_stat_lock();
+        disk_stat_inc(cpu, mddev->gendisk, ios[rw]);
+        disk_stat_add(cpu, mddev->gendisk, sectors[rw], bio_sectors(bi));
+        disk_stat_unlock();
 
         if (rw == READ &&
              mddev->reshape_position == MaxSector &&