diff options
| author | Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> | 2016-11-28 15:01:48 -0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-11-29 08:01:08 -0700 |
| commit | 415d3dab964c1a9bc6ceb8941bd4dbe4fbe36a09 (patch) | |
| tree | f278c4253c44aa3c1e9d15fd12e235eb815bd605 /block | |
| parent | d62118b6dd99b8f64350206a6ea6996083b28c9a (diff) | |
| download | lwn-415d3dab964c1a9bc6ceb8941bd4dbe4fbe36a09.tar.gz lwn-415d3dab964c1a9bc6ceb8941bd4dbe4fbe36a09.zip | |
blk-mq: Drop explicit timeout sync in hotplug
After commit 287922eb0b18 ("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: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Reviewed-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 9d4a1d630d0b..bac12caece06 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2220,16 +2220,9 @@ static void blk_mq_queue_reinit_work(void) */ list_for_each_entry(q, &all_q_list, all_q_node) 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); - /* - * 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) blk_mq_queue_reinit(q, &cpuhp_online_new); |