diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2013-12-26 21:31:36 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-31 09:53:05 -0700 |
| commit | f04c1fe7619b2a60ee9e209cf3f9fcba2ce8f2a2 (patch) | |
| tree | 3b5dbe682ca8cd87b466104457d3a25d0f431d2b /block | |
| parent | 43a5e4e21964a6efb4d14a34644ec7109d0ae891 (diff) | |
block: blk-mq: make blk_sync_queue support mq
This patch moves synchronization on mq->delay_work
from blk_mq_free_queue() to blk_sync_queue(), so that
blk_sync_queue can work on mq.
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 11 | ||||
| -rw-r--r-- | block/blk-mq.c | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index accb7fc6ec9..c00e0bdeab4 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -246,7 +246,16 @@ EXPORT_SYMBOL(blk_stop_queue); void blk_sync_queue(struct request_queue *q) { del_timer_sync(&q->timeout); - cancel_delayed_work_sync(&q->delay_work); + + if (q->mq_ops) { + struct blk_mq_hw_ctx *hctx; + int i; + + queue_for_each_hw_ctx(q, hctx, i) + cancel_delayed_work_sync(&hctx->delayed_work); + } else { + cancel_delayed_work_sync(&q->delay_work); + } } EXPORT_SYMBOL(blk_sync_queue); diff --git a/block/blk-mq.c b/block/blk-mq.c index e2f811cba41..edbd2536f94 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1440,7 +1440,6 @@ void blk_mq_free_queue(struct request_queue *q) int i; queue_for_each_hw_ctx(q, hctx, i) { - cancel_delayed_work_sync(&hctx->delayed_work); kfree(hctx->ctx_map); kfree(hctx->ctxs); blk_mq_free_rq_map(hctx); |