From: Yufen Yu Date: Fri, 9 Oct 2020 03:26:27 +0000 (-0400) Subject: block: invoke blk_mq_exit_sched no matter whether have .exit_sched X-Git-Tag: v5.10-rc1~168^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd1c372d656600234a1704f456f9977ca684865c;p=thirdparty%2Fkernel%2Flinux.git block: invoke blk_mq_exit_sched no matter whether have .exit_sched We will register debugfs for scheduler no matter whether it have defined callback funciton .exit_sched. So, blk_mq_exit_sched() is always needed to unregister debugfs. Also, q->elevator should be set as NULL after exiting scheduler. For now, since all register scheduler have defined .exit_sched, it will not cause any actual problem. But It will be more reasonable to do this change. Signed-off-by: Yufen Yu Signed-off-by: Jens Axboe --- diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 76b54c7750b07..e35eb1a05ad23 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -740,7 +740,6 @@ static void blk_exit_queue(struct request_queue *q) if (q->elevator) { ioc_clear_queue(q); __elevator_exit(q, q->elevator); - q->elevator = NULL; } /* diff --git a/block/elevator.c b/block/elevator.c index 90ed7a28c21d3..7d76b61e157a4 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -191,8 +191,7 @@ static void elevator_release(struct kobject *kobj) void __elevator_exit(struct request_queue *q, struct elevator_queue *e) { mutex_lock(&e->sysfs_lock); - if (e->type->ops.exit_sched) - blk_mq_exit_sched(q, e); + blk_mq_exit_sched(q, e); mutex_unlock(&e->sysfs_lock); kobject_put(&e->kobj);