4 files changed, 31 insertions, 13 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 797d5095eb83..ddc68332d655 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -64,13 +64,15 @@ static void drive_stat_acct(struct request *rq, int new_io)
                 return;
 
         cpu = part_stat_lock();
-        part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));
 
-        if (!new_io)
+        if (!new_io) {
+                part = rq->part;
                 part_stat_inc(cpu, part, merges[rw]);
-        else {
+        } else {
+                part = disk_map_sector_rcu(rq->rq_disk, blk_rq_pos(rq));
                 part_round_stats(cpu, part);
                 part_inc_in_flight(part, rw);
+                rq->part = part;
         }
 
         part_stat_unlock();
@@ -128,6 +130,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
         rq->ref_count = 1;
         rq->start_time = jiffies;
         set_start_time_ns(rq);
+        rq->part = NULL;
 }
 EXPORT_SYMBOL(blk_rq_init);
 
@@ -804,11 +807,16 @@ static struct request *get_request(struct request_queue *q, int rw_flags,
         rl->starved[is_sync] = 0;
 
         priv = !test_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
-        if (priv)
+        if (priv) {
                 rl->elvpriv++;
 
-        if (blk_queue_io_stat(q))
-                rw_flags |= REQ_IO_STAT;
+                /*
+                 * Don't do stats for non-priv requests
+                 */
+                if (blk_queue_io_stat(q))
+                        rw_flags |= REQ_IO_STAT;
+        }
+
         spin_unlock_irq(q->queue_lock);
 
         rq = blk_alloc_request(q, rw_flags, priv, gfp_mask);
@@ -1777,7 +1785,7 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes)
                 int cpu;
 
                 cpu = part_stat_lock();
-                part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
+                part = req->part;
                 part_stat_add(cpu, part, sectors[rw], bytes >> 9);
                 part_stat_unlock();
         }
@@ -1797,7 +1805,7 @@ static void blk_account_io_done(struct request *req)
                 int cpu;
 
                 cpu = part_stat_lock();
-                part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
+                part = req->part;
 
                 part_stat_inc(cpu, part, ios[rw]);
                 part_stat_add(cpu, part, ticks[rw], duration);
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 6a725461654d..38ff234012a4 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -351,7 +351,7 @@ static void blk_account_io_merge(struct request *req)
                 int cpu;
 
                 cpu = part_stat_lock();
-                part = disk_map_sector_rcu(req->rq_disk, blk_rq_pos(req));
+                part = req->part;
 
                 part_round_stats(cpu, part);
                 part_dec_in_flight(part, rq_data_dir(req));
diff --git a/block/blk.h b/block/blk.h
index 6738831ba447..1340cce5721a 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -110,10 +110,6 @@ void blk_queue_congestion_threshold(struct request_queue *q);
 
 int blk_dev_init(void);
 
-void elv_quiesce_start(struct request_queue *q);
-void elv_quiesce_end(struct request_queue *q);
-
-
 /*
  * Return the threshold (number of used requests) at which the queue is
  * considered to be congested.  It include a little hysteresis to keep the
diff --git a/block/genhd.c b/block/genhd.c
index 7923e720ddf5..8313834596db 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -932,8 +932,15 @@ static void disk_free_ptbl_rcu_cb(struct rcu_head *head)
 {
         struct disk_part_tbl *ptbl =
                 container_of(head, struct disk_part_tbl, rcu_head);
+        struct gendisk *disk = ptbl->disk;
+        struct request_queue *q = disk->queue;
+        unsigned long flags;
 
         kfree(ptbl);
+
+        spin_lock_irqsave(q->queue_lock, flags);
+        elv_quiesce_end(q);
+        spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
 /**
@@ -951,11 +958,17 @@ static void disk_replace_part_tbl(struct gendisk *disk,
                                   struct disk_part_tbl *new_ptbl)
 {
         struct disk_part_tbl *old_ptbl = disk->part_tbl;
+        struct request_queue *q = disk->queue;
 
         rcu_assign_pointer(disk->part_tbl, new_ptbl);
 
         if (old_ptbl) {
                 rcu_assign_pointer(old_ptbl->last_lookup, NULL);
+
+                spin_lock_irq(q->queue_lock);
+                elv_quiesce_start(q);
+                spin_unlock_irq(q->queue_lock);
+
                 call_rcu(&old_ptbl->rcu_head, disk_free_ptbl_rcu_cb);
         }
 }
@@ -996,6 +1009,7 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno)
                 return -ENOMEM;
 
         new_ptbl->len = target;
+        new_ptbl->disk = disk;
 
         for (i = 0; i < len; i++)
                 rcu_assign_pointer(new_ptbl->part[i], old_ptbl->part[i]);