Commit ba3e8456 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: move q_usage_counter release into blk_queue_release 



After blk_cleanup_queue() returns, disk may not be released yet, so
probably bio may still be submitted and ->q_usage_counter may be
touched, so far this way seems safe, but not good from API's viewpoint.

Move the release q_usage_counter into blk_queue_release().

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220308055200.735835-12-hch@lst.de


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

block/blk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -342,8 +342,6 @@ void blk_cleanup_queue(struct request_queue *q) 
		blk_mq_sched_free_rqs(q);

	mutex_unlock(&q->sysfs_lock);



	percpu_ref_exit(&q->q_usage_counter);



	/* @q is and will stay empty, shutdown and put */

	blk_put_queue(q);

}

block/blk-sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -780,6 +780,8 @@ static void blk_release_queue(struct kobject *kobj) 


	might_sleep();



	percpu_ref_exit(&q->q_usage_counter);



	if (q->poll_stat)

		blk_stat_remove_callback(q, q->poll_cb);

	blk_stat_free_callback(q->poll_cb);