block: do more work in elevator_exit

Move the calls to ioc_clear_queue and blk_mq_sched_free_rqs into
elevator_exit.  Except for one call where we know we can't have io_cq
structures yet these always go together, and that extra call in an
error path is harmless.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/elevator.c b/block/elevator.c
index 9a9e52374e27071bd45d09c71ee026cd681c1af9..c319765892bb90f00162cb6cac03f8d5434e64b2 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -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);
@@ -594,8 +597,6 @@ int elevator_switch_mq(struct request_queue *q,
 
        if (q->elevator) {
                elv_unregister_queue(q);
-               ioc_clear_queue(q);
-               blk_mq_sched_free_rqs(q);
                elevator_exit(q);
        }
 
@@ -606,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;
                }

diff --git a/block/genhd.c b/block/genhd.c
index bf44c8394cf5df04dfbfd74788346d581a367058..ec4c5e9c98a1e375fc12a429ba44ff36381087ee 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1129,10 +1129,7 @@ static void disk_release_mq(struct request_queue *q)
         * cgroup controller.
         */
        if (q->elevator) {
-               ioc_clear_queue(q);
-
                mutex_lock(&q->sysfs_lock);
-               blk_mq_sched_free_rqs(q);
                elevator_exit(q);
                mutex_unlock(&q->sysfs_lock);
        }