diff options
author | Omar Sandoval <osandov@fb.com> | 2017-04-07 10:52:27 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-07 10:56:48 -0400 |
commit | 54d5329d425650fafaf90660a139c771d2d49cae (patch) | |
tree | 3fc6db73809742be0f0fdf403c77af02a6feeeba /block/blk-mq-sched.h | |
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-sched.h')
-rw-r--r-- | block/blk-mq-sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 19db25e0c95a..e704956e0862 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h | |||
@@ -33,7 +33,7 @@ void blk_mq_sched_move_to_dispatch(struct blk_mq_hw_ctx *hctx, | |||
33 | struct request *(*get_rq)(struct blk_mq_hw_ctx *)); | 33 | struct request *(*get_rq)(struct blk_mq_hw_ctx *)); |
34 | 34 | ||
35 | int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e); | 35 | int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e); |
36 | void blk_mq_sched_teardown(struct request_queue *q); | 36 | void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e); |
37 | 37 | ||
38 | int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, | 38 | int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, |
39 | unsigned int hctx_idx); | 39 | unsigned int hctx_idx); |