diff options
| author | Ming Lei <ming.lei@redhat.com> | 2025-05-05 22:17:42 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-19 15:32:32 +0200 |
| commit | a5c7b61eed6dfc41ed1123581fdfe7c2e4f17bb7 (patch) | |
| tree | f01c9f2e2f80988ec7fe50c50d2449eae58ff60d /block | |
| parent | f351bb3085016cd4471f11ca8965228d418e7753 (diff) | |
| download | linux-a5c7b61eed6dfc41ed1123581fdfe7c2e4f17bb7.tar.gz linux-a5c7b61eed6dfc41ed1123581fdfe7c2e4f17bb7.tar.bz2 linux-a5c7b61eed6dfc41ed1123581fdfe7c2e4f17bb7.zip | |
block: use q->elevator with ->elevator_lock held in elv_iosched_show()
[ Upstream commit 94209d27d14104ed828ca88cd5403a99162fe51a ]
Use q->elevator with ->elevator_lock held in elv_iosched_show(), since
the local cached elevator reference may become stale after getting
->elevator_lock.
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250505141805.2751237-5-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 43ba4ab1ada7..1f76e9efd771 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -752,7 +752,6 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf, ssize_t elv_iosched_show(struct gendisk *disk, char *name) { struct request_queue *q = disk->queue; - struct elevator_queue *eq = q->elevator; struct elevator_type *cur = NULL, *e; int len = 0; @@ -763,7 +762,7 @@ ssize_t elv_iosched_show(struct gendisk *disk, char *name) len += sprintf(name+len, "[none] "); } else { len += sprintf(name+len, "none "); - cur = eq->type; + cur = q->elevator->type; } spin_lock(&elv_list_lock); |