block: remove the e argument to elevator_exit

All callers pass q->elevator.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211123185312.1432157-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 1677eb4a680c47d32261430cfb4985853e58e29b..772347adc56b38290001fbce9a88d38cbf11ceeb 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -747,7 +747,7 @@ static void blk_exit_queue(struct request_queue *q)
         */
        if (q->elevator) {
                ioc_clear_queue(q);
-               elevator_exit(q, q->elevator);
+               elevator_exit(q);
        }
 
        /*

diff --git a/block/blk.h b/block/blk.h
index 2266cb1f7df537f4353d485a19b5d7b296c09bc8..4df2ce8d4999b955d06e22100d2ca93b109dff40 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -266,7 +266,7 @@ void blk_insert_flush(struct request *rq);
 
 int elevator_switch_mq(struct request_queue *q,
                              struct elevator_type *new_e);
-void elevator_exit(struct request_queue *, struct elevator_queue *);
+void elevator_exit(struct request_queue *q);
 int elv_register_queue(struct request_queue *q, bool uevent);
 void elv_unregister_queue(struct request_queue *q);
 

diff --git a/block/elevator.c b/block/elevator.c
index 3536cdd5fa12988fedd55f4796a79c5b595d214f..ec98aed39c4f5beb7a4b2d2cef618498ebd22d22 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -188,8 +188,10 @@ static void elevator_release(struct kobject *kobj)
        kfree(e);
 }
 
-void elevator_exit(struct request_queue *q, struct elevator_queue *e)
+void elevator_exit(struct request_queue *q)
 {
+       struct elevator_queue *e = q->elevator;
+
        mutex_lock(&e->sysfs_lock);
        blk_mq_exit_sched(q, e);
        mutex_unlock(&e->sysfs_lock);
@@ -596,7 +598,7 @@ int elevator_switch_mq(struct request_queue *q,
 
                ioc_clear_queue(q);
                blk_mq_sched_free_rqs(q);
-               elevator_exit(q, q->elevator);
+               elevator_exit(q);
        }
 
        ret = blk_mq_init_sched(q, new_e);
@@ -607,7 +609,7 @@ int elevator_switch_mq(struct request_queue *q,
                ret = elv_register_queue(q, true);
                if (ret) {
                        blk_mq_sched_free_rqs(q);
-                       elevator_exit(q, q->elevator);
+                       elevator_exit(q);
                        goto out;
                }
        }