diff options
| author | Omar Sandoval <osandov@fb.com> | 2017-04-07 16:52:27 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-07 16:56:48 +0200 |
| commit | 54d5329d425650fafaf90660a139c771d2d49cae (patch) | |
| tree | 3fc6db73809742be0f0fdf403c77af02a6feeeba /block/blk-sysfs.c | |
| parent | blk-mq-sched: set up scheduler tags when bringing up new queues (diff) | |
| download | linux-54d5329d425650fafaf90660a139c771d2d49cae.tar.xz linux-54d5329d425650fafaf90660a139c771d2d49cae.zip | |
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-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index c44b321335f3..37f0b3ad635e 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -816,7 +816,7 @@ static void blk_release_queue(struct kobject *kobj) if (q->elevator) { ioc_clear_queue(q); - elevator_exit(q->elevator); + elevator_exit(q, q->elevator); } blk_exit_rl(&q->root_rl); |