block: Do not call blk_put_queue() if gendisk allocation fails

[linux-stable] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 89f22a677f4182672642bdb9480d3344e4e108fc..e7ab9f3b869cba6c4a5e441397b6ba276d7e6adf 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1359,7 +1359,7 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
 
        disk = kzalloc_node(sizeof(struct gendisk), GFP_KERNEL, node_id);
        if (!disk)
-               goto out_put_queue;
+               return NULL;
 
        disk->bdi = bdi_alloc(node_id);
        if (!disk->bdi)
@@ -1403,8 +1403,6 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
        bdi_put(disk->bdi);
 out_free_disk:
        kfree(disk);
-out_put_queue:
-       blk_put_queue(q);
        return NULL;
 }