Merge tag 'dma-mapping-5.18' of git://git.infradead.org/users/hch/dma-mapping

[uclinux-h8/linux.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index ec98aed..c319765 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -35,7 +35,6 @@
 #include <linux/hash.h>
 #include <linux/uaccess.h>
 #include <linux/pm_runtime.h>
-#include <linux/blk-cgroup.h>
 
 #include <trace/events/block.h>
 
@@ -44,6 +43,7 @@
 #include "blk-mq-sched.h"
 #include "blk-pm.h"
 #include "blk-wbt.h"
+#include "blk-cgroup.h"
 
 static DEFINE_SPINLOCK(elv_list_lock);
 static LIST_HEAD(elv_list);
@@ -192,6 +192,9 @@ void elevator_exit(struct request_queue *q)
 {
        struct elevator_queue *e = q->elevator;
 
+       ioc_clear_queue(q);
+       blk_mq_sched_free_rqs(q);
+
        mutex_lock(&e->sysfs_lock);
        blk_mq_exit_sched(q, e);
        mutex_unlock(&e->sysfs_lock);
@@ -516,17 +519,17 @@ int elv_register_queue(struct request_queue *q, bool uevent)
 
 void elv_unregister_queue(struct request_queue *q)
 {
+       struct elevator_queue *e = q->elevator;
+
        lockdep_assert_held(&q->sysfs_lock);
 
-       if (q) {
+       if (e && e->registered) {
                struct elevator_queue *e = q->elevator;
 
                kobject_uevent(&e->kobj, KOBJ_REMOVE);
                kobject_del(&e->kobj);
 
                e->registered = 0;
-               /* Re-enable throttling in case elevator disabled it */
-               wbt_enable_default(q);
        }
 }
 
@@ -593,11 +596,7 @@ int elevator_switch_mq(struct request_queue *q,
        lockdep_assert_held(&q->sysfs_lock);
 
        if (q->elevator) {
-               if (q->elevator->registered)
-                       elv_unregister_queue(q);
-
-               ioc_clear_queue(q);
-               blk_mq_sched_free_rqs(q);
+               elv_unregister_queue(q);
                elevator_exit(q);
        }
 
@@ -608,7 +607,6 @@ int elevator_switch_mq(struct request_queue *q,
        if (new_e) {
                ret = elv_register_queue(q, true);
                if (ret) {
-                       blk_mq_sched_free_rqs(q);
                        elevator_exit(q);
                        goto out;
                }