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

Commit 415d3dab authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Jens Axboe
Browse files

blk-mq: Drop explicit timeout sync in hotplug 



After commit 287922eb ("block: defer timeouts to a workqueue"),
deleting the timeout work after freezing the queue shouldn't be
necessary, since the synchronization is already enforced by the
acquisition of a q_usage_counter reference in blk_mq_timeout_work.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Reviewed-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d62118b6

block/blk-mq.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -2220,16 +2220,9 @@ static void blk_mq_queue_reinit_work(void) 
	 */

	 */

	list_for_each_entry(q, &all_q_list, all_q_node)

	list_for_each_entry(q, &all_q_list, all_q_node)

		blk_mq_freeze_queue_start(q);

		blk_mq_freeze_queue_start(q);

	list_for_each_entry(q, &all_q_list, all_q_node) {

	list_for_each_entry(q, &all_q_list, all_q_node)

		blk_mq_freeze_queue_wait(q);

		blk_mq_freeze_queue_wait(q);





		/*

		 * timeout handler can't touch hw queue during the

		 * reinitialization

		 */

		del_timer_sync(&q->timeout);

	}



	list_for_each_entry(q, &all_q_list, all_q_node)

	list_for_each_entry(q, &all_q_list, all_q_node)

		blk_mq_queue_reinit(q, &cpuhp_online_new);

		blk_mq_queue_reinit(q, &cpuhp_online_new);