Commit 0a3e5cc7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: fix error handling in __blk_mq_alloc_disk 



To fully clean up the queue if the disk allocation fails we need to
call blk_mq_destroy_queue and not just blk_put_queue.

Fixes: 6f8191fd ("block: simplify disk shutdown")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20220720130541.1323531-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6d9e6dfd

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -3960,7 +3960,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata, 


	disk = __alloc_disk_node(q, set->numa_node, lkclass);

	if (!disk) {

		blk_put_queue(q);

		blk_mq_destroy_queue(q);

		return ERR_PTR(-ENOMEM);

	}

	set_bit(GD_OWNS_QUEUE, &disk->state);