Revert "block: fix accounting bug on cross partition merges"

This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327.

Conflicts:

	include/linux/genhd.h

It has numerous issues with the cleanup path and non-elevator
devices. Revert it for now so we can come up with a clean
version without rushing things.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 0 insertions, 14 deletions

diff --git a/block/genhd.c b/block/genhd.c
index a8adf96a4b41..5fa2b44a72ff 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -929,15 +929,8 @@ 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);
 }
 
 /**
@@ -955,17 +948,11 @@ 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);
         }
 }
@@ -1006,7 +993,6 @@ 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]);