Skip to content

Commit 3e9a5f6

Browse files
author
Ming Lei
committed
block: use q->elevator with ->elevator_lock held in elv_iosched_show()
JIRA: https://issues.redhat.com/browse/RHEL-106845 commit 94209d2 Author: Ming Lei <ming.lei@redhat.com> Date: Mon May 5 22:17:42 2025 +0800 block: use q->elevator with ->elevator_lock held in elv_iosched_show() 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: Ming Lei <ming.lei@redhat.com>
1 parent 73450d4 commit 3e9a5f6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

block/elevator.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,6 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,
739739
ssize_t elv_iosched_show(struct gendisk *disk, char *name)
740740
{
741741
struct request_queue *q = disk->queue;
742-
struct elevator_queue *eq = q->elevator;
743742
struct elevator_type *cur = NULL, *e;
744743
int len = 0;
745744

@@ -748,7 +747,7 @@ ssize_t elv_iosched_show(struct gendisk *disk, char *name)
748747
len += sprintf(name+len, "[none] ");
749748
} else {
750749
len += sprintf(name+len, "none ");
751-
cur = eq->type;
750+
cur = q->elevator->type;
752751
}
753752

754753
spin_lock(&elv_list_lock);

0 commit comments

Comments
 (0)