Skip to content

Commit 53949e4

Browse files
Ming LeiSasha Levin
authored andcommitted
block: use q->elevator with ->elevator_lock held in elv_iosched_show()
[ Upstream commit 94209d2 ] 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>
1 parent 5611530 commit 53949e4

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
@@ -744,7 +744,6 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,
744744
ssize_t elv_iosched_show(struct gendisk *disk, char *name)
745745
{
746746
struct request_queue *q = disk->queue;
747-
struct elevator_queue *eq = q->elevator;
748747
struct elevator_type *cur = NULL, *e;
749748
int len = 0;
750749

@@ -753,7 +752,7 @@ ssize_t elv_iosched_show(struct gendisk *disk, char *name)
753752
len += sprintf(name+len, "[none] ");
754753
} else {
755754
len += sprintf(name+len, "none ");
756-
cur = eq->type;
755+
cur = q->elevator->type;
757756
}
758757

759758
spin_lock(&elv_list_lock);

0 commit comments

Comments
 (0)