diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-10 09:54:54 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-28 08:10:15 -0600 |
| commit | 9f993737906b30d7b2454a38637d1f70ffd60f2f (patch) | |
| tree | de9f50b9f8411ad9306796746900195a0b6f45e6 /block/blk-core.c | |
| parent | 60ae36ad0340b1ba88530d6a5e141455dd3afd81 (diff) | |
| download | linux-9f993737906b30d7b2454a38637d1f70ffd60f2f.tar.gz linux-9f993737906b30d7b2454a38637d1f70ffd60f2f.tar.bz2 linux-9f993737906b30d7b2454a38637d1f70ffd60f2f.zip | |
blk-mq: unify hctx delayed_run_work and run_work
They serve the exact same purpose. Get rid of the non-delayed
work variant, and just run it without delay for the normal case.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 6bd4d1754d29..37939672d4df 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -269,7 +269,7 @@ void blk_sync_queue(struct request_queue *q) int i; queue_for_each_hw_ctx(q, hctx, i) { - cancel_work_sync(&hctx->run_work); + cancel_delayed_work_sync(&hctx->run_work); cancel_delayed_work_sync(&hctx->delay_work); } } else { |