Commit 94209d27 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

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: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarNilay Shroff <nilay@linux.ibm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250505141805.2751237-5-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f8e111c8

block/elevator.c

+1 −2
Original line number Diff line number Diff line
@@ -739,7 +739,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;
@@ -748,7 +747,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);