3 files changed, 11 insertions, 9 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index b3228255304d..f8cb09951830 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -839,6 +839,9 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask)
 {
         struct request *rq;
 
+        if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)))
+                return NULL;
+
         BUG_ON(rw != READ && rw != WRITE);
 
         spin_lock_irq(q->queue_lock);
diff --git a/block/blk-exec.c b/block/blk-exec.c
index 8a0e7ec056e7..a1ebceb332f9 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 {
         int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
 
+        if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
+                rq->errors = -ENXIO;
+                if (rq->end_io)
+                        rq->end_io(rq, rq->errors);
+                return;
+        }
+
         rq->rq_disk = bd_disk;
         rq->end_io = done;
         WARN_ON(irqs_disabled());
diff --git a/block/genhd.c b/block/genhd.c
index fbd7605a5865..5cb51c55f6d8 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1018,14 +1018,6 @@ static const struct attribute_group *disk_attr_groups[] = {
         NULL
 };
 
-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);
-
-        kfree(ptbl);
-}
-
 /**
  * disk_replace_part_tbl - replace disk->part_tbl in RCU-safe way
  * @disk: disk to replace part_tbl for
@@ -1046,7 +1038,7 @@ static void disk_replace_part_tbl(struct gendisk *disk,
 
         if (old_ptbl) {
                 rcu_assign_pointer(old_ptbl->last_lookup, NULL);
-                call_rcu(&old_ptbl->rcu_head, disk_free_ptbl_rcu_cb);
+                kfree_rcu(old_ptbl, rcu_head);
         }
 }