summaryrefslogtreecommitdiff
path: root/block/elevator.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-11-23 21:53:07 +0300
committerJens Axboe <axboe@kernel.dk>2021-11-29 16:38:44 +0300
commit0c6cb3a293fa9adc7be24d67ff7d201aefa50362 (patch)
treed06743648614a5733f030e42b582c5ba701a815f /block/elevator.c
parentf46b81c54b241bf1ec01c8936a37201c99f94fc7 (diff)
downloadlinux-0c6cb3a293fa9adc7be24d67ff7d201aefa50362.tar.xz
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>
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 3536cdd5fa12..ec98aed39c4f 100644
--- 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;
}
}