Commit 73f1c77e authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Reduce sysfs_lock locking inside blk_cleanup_queue() 



Since blk_cleanup_queue() is called after blk_unregister_queue() and
since that last function removes all sysfs attributes, serializing
any code in blk_cleanup_queue() against sysfs callback methods nor against
I/O scheduler changes is necessary. Hence remove the syfs_lock locking
calls from the start of blk_cleanup_queue().

Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bae85c15

block/blk-core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -339,13 +339,11 @@ void blk_cleanup_queue(struct request_queue *q) 
	WARN_ON_ONCE(blk_queue_registered(q));

	WARN_ON_ONCE(blk_queue_registered(q));





	/* mark @q DYING, no new request or merges will be allowed afterwards */

	/* mark @q DYING, no new request or merges will be allowed afterwards */

	mutex_lock(&q->sysfs_lock);

	blk_set_queue_dying(q);

	blk_set_queue_dying(q);





	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q);

	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q);

	blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q);

	blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q);

	blk_queue_flag_set(QUEUE_FLAG_DYING, q);

	blk_queue_flag_set(QUEUE_FLAG_DYING, q);

	mutex_unlock(&q->sysfs_lock);





	/*

	/*

	 * Drain all requests queued before DYING marking. Set DEAD flag to

	 * Drain all requests queued before DYING marking. Set DEAD flag to

CRA Git | Maintained and supported by SUSTech CRA and CCSE