diff options
| author | Ming Lei <ming.lei@redhat.com> | 2025-05-05 22:17:55 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-05-06 07:43:43 -0600 |
| commit | a3dc6279c2d5e2653b198684eb8857f414b6768f (patch) | |
| tree | a9a3b800a2104ec3f5d7a2847e6a8b8a90a75099 /block/elevator.c | |
| parent | 1e44bedbc921a35cb847991953814a50f738bcf3 (diff) | |
| download | linux-a3dc6279c2d5e2653b198684eb8857f414b6768f.tar.gz linux-a3dc6279c2d5e2653b198684eb8857f414b6768f.tar.bz2 linux-a3dc6279c2d5e2653b198684eb8857f414b6768f.zip | |
block: pass elevator_queue to elv_register_queue & unregister_queue
Pass elevator_queue reference to elv_register_queue() & elv_unregister_queue().
No functional change, and prepare for moving the two out of elevator
lock & freezing queue, when we need to store the old & new elevator
queue in `struct elv_change_ctx` instance, then both two can co-exist
for short while, so we have to pass the exact elevator_queue instance
to elv_register_queue & unregister_queue.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250505141805.2751237-18-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/block/elevator.c b/block/elevator.c index 540542cee21c..eb7140a678d5 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -458,9 +458,10 @@ static const struct kobj_type elv_ktype = { .release = elevator_release, }; -static int elv_register_queue(struct request_queue *q, bool uevent) +static int elv_register_queue(struct request_queue *q, + struct elevator_queue *e, + bool uevent) { - struct elevator_queue *e = q->elevator; int error; lockdep_assert_held(&q->elevator_lock); @@ -488,10 +489,9 @@ static int elv_register_queue(struct request_queue *q, bool uevent) return error; } -static void elv_unregister_queue(struct request_queue *q) +static void elv_unregister_queue(struct request_queue *q, + struct elevator_queue *e) { - struct elevator_queue *e = q->elevator; - lockdep_assert_held(&q->elevator_lock); if (e && test_and_clear_bit(ELEVATOR_FLAG_REGISTERED, &e->flags)) { @@ -584,7 +584,7 @@ static int elevator_switch(struct request_queue *q, struct elv_change_ctx *ctx) blk_mq_quiesce_queue(q); if (q->elevator) { - elv_unregister_queue(q); + elv_unregister_queue(q, q->elevator); elevator_exit(q); } @@ -592,7 +592,7 @@ static int elevator_switch(struct request_queue *q, struct elv_change_ctx *ctx) ret = blk_mq_init_sched(q, new_e); if (ret) goto out_unfreeze; - ret = elv_register_queue(q, !ctx->no_uevent); + ret = elv_register_queue(q, q->elevator, !ctx->no_uevent); if (ret) { elevator_exit(q); goto out_unfreeze; |