Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a30b096 authored by Mike Snitzer's avatar Mike Snitzer Committed by Jens Axboe
Browse files

blk-mq: fix use of incorrect goto label in blk_mq_init_queue error path 



If percpu_ref_init() fails the allocated q and hctxs must get cleaned
up; using 'err_map' doesn't allow that to happen.

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Reviewed-by: default avatarMing Lei <ming.lei@canonical.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b8be79b7

block/blk-mq.c

+3 −3
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) 
	 */

	if (percpu_ref_init(&q->mq_usage_counter, blk_mq_usage_counter_release,

			    PERCPU_REF_INIT_ATOMIC, GFP_KERNEL))

		goto err_map;

		goto err_mq_usage;



	setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);

	blk_queue_rq_timeout(q, 30000);
@@ -1981,7 +1981,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) 
	blk_mq_init_cpu_queues(q, set->nr_hw_queues);



	if (blk_mq_init_hw_queues(q, set))

		goto err_hw;

		goto err_mq_usage;



	mutex_lock(&all_q_mutex);

	list_add_tail(&q->all_q_node, &all_q_list);
@@ -1993,7 +1993,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) 


	return q;



err_hw:

err_mq_usage:

	blk_cleanup_queue(q);

err_hctxs:

	kfree(map);