superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: move blk_queue_registered() check into elv_iosched_store() 

Move blk_queue_registered() check into elv_iosched_store() and prepare
for using elevator_change() for covering any kind of elevator change in
adding/deleting disk and updating nr_hw_queue.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250505141805.2751237-13-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1250/head
Ming Lei 2025-05-05 22:17:50 +08:00 committed by Jens Axboe
parent 1bb7fba0e2
commit ac55b71a31
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/elevator.c
View File

@ -676,10 +676,6 @@ out_unfreeze:
*/ */
static int elevator_change(struct request_queue *q, const char *elevator_name) static int elevator_change(struct request_queue *q, const char *elevator_name)
{ {
/* Make sure queue is not in the middle of being removed */
if (!blk_queue_registered(q))
return -ENOENT;
if (q->elevator && elevator_match(q->elevator->type, elevator_name)) if (q->elevator && elevator_match(q->elevator->type, elevator_name))
return 0; return 0;
@ -708,6 +704,10 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,
struct request_queue *q = disk->queue; struct request_queue *q = disk->queue;
struct blk_mq_tag_set *set = q->tag_set; struct blk_mq_tag_set *set = q->tag_set;
/* Make sure queue is not in the middle of being removed */
if (!blk_queue_registered(q))
return -ENOENT;
/* /*
* If the attribute needs to load a module, do it before freezing the * If the attribute needs to load a module, do it before freezing the
* queue to ensure that the module file can be read when the request * queue to ensure that the module file can be read when the request