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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
f351bb3085
commit
a5c7b61eed
+1
-2
@@ -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)
|
ssize_t elv_iosched_show(struct gendisk *disk, char *name)
|
||||||
{
|
{
|
||||||
struct request_queue *q = disk->queue;
|
struct request_queue *q = disk->queue;
|
||||||
struct elevator_queue *eq = q->elevator;
|
|
||||||
struct elevator_type *cur = NULL, *e;
|
struct elevator_type *cur = NULL, *e;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
|
||||||
@@ -763,7 +762,7 @@ ssize_t elv_iosched_show(struct gendisk *disk, char *name)
|
|||||||
len += sprintf(name+len, "[none] ");
|
len += sprintf(name+len, "[none] ");
|
||||||
} else {
|
} else {
|
||||||
len += sprintf(name+len, "none ");
|
len += sprintf(name+len, "none ");
|
||||||
cur = eq->type;
|
cur = q->elevator->type;
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_lock(&elv_list_lock);
|
spin_lock(&elv_list_lock);
|
||||||
|
|||||||
Reference in New Issue
Block a user