mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2021-11-23 19:53:07 +01:00 committed by Jens Axboe
parent f46b81c54b
commit 0c6cb3a293
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-sysfs.c
View File

@ -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);
}
/*

2
block/blk.h
View File

@ -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);

8
block/elevator.c
View File

@ -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;
}
}