1 files changed, 14 insertions, 6 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 3bc5579d6f54..f84cce42fc58 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -467,6 +467,9 @@ static int blk_init_free_list(struct request_queue *q)
 {
         struct request_list *rl = &q->rq;
 
+        if (unlikely(rl->rq_pool))
+                return 0;
+
         rl->count[BLK_RW_SYNC] = rl->count[BLK_RW_ASYNC] = 0;
         rl->starved[BLK_RW_SYNC] = rl->starved[BLK_RW_ASYNC] = 0;
         rl->elvpriv = 0;
@@ -570,9 +573,17 @@ EXPORT_SYMBOL(blk_init_queue);
 struct request_queue *
 blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
 {
-        struct request_queue *q = blk_alloc_queue_node(GFP_KERNEL, node_id);
+        struct request_queue *uninit_q, *q;
+
+        uninit_q = blk_alloc_queue_node(GFP_KERNEL, node_id);
+        if (!uninit_q)
+                return NULL;
+
+        q = blk_init_allocated_queue_node(uninit_q, rfn, lock, node_id);
+        if (!q)
+                blk_cleanup_queue(uninit_q);
 
-        return blk_init_allocated_queue_node(q, rfn, lock, node_id);
+        return q;
 }
 EXPORT_SYMBOL(blk_init_queue_node);
 
@@ -592,10 +603,8 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
                 return NULL;
 
         q->node = node_id;
-        if (blk_init_free_list(q)) {
-                kmem_cache_free(blk_requestq_cachep, q);
+        if (blk_init_free_list(q))
                 return NULL;
-        }
 
         q->request_fn           = rfn;
         q->prep_rq_fn           = NULL;
@@ -618,7 +627,6 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
                 return q;
         }
 
-        blk_put_queue(q);
         return NULL;
 }
 EXPORT_SYMBOL(blk_init_allocated_queue_node);