diff options
author | Omar Sandoval <osandov@fb.com> | 2017-04-07 17:52:27 +0300 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-07 17:56:48 +0300 |
commit | 54d5329d425650fafaf90660a139c771d2d49cae (patch) | |
tree | 3fc6db73809742be0f0fdf403c77af02a6feeeba /block/blk-mq.c | |
parent | 93252632e828da3e90241a1c0e766556abf71598 (diff) |
blk-mq-sched: fix crash in switch error path
In elevator_switch(), if blk_mq_init_sched() fails, we attempt to fall
back to the original scheduler. However, at this point, we've already
torn down the original scheduler's tags, so this causes a crash. Doing
the fallback like the legacy elevator path is much harder for mq, so fix
it by just falling back to none, instead.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-mq.c')
-rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 72e744cd638c..cfb7c97b14ec 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2240,8 +2240,6 @@ void blk_mq_release(struct request_queue *q) struct blk_mq_hw_ctx *hctx; unsigned int i; - blk_mq_sched_teardown(q); - /* hctx kobj stays in hctx */ queue_for_each_hw_ctx(q, hctx, i) { if (!hctx) |