Skip to content

Commit 05b38a7

Browse files
author
Ming Lei
committed
block: move blk_queue_registered() check into elv_iosched_store()
JIRA: https://issues.redhat.com/browse/RHEL-106845 commit ac55b71 Author: Ming Lei <ming.lei@redhat.com> Date: Mon May 5 22:17:50 2025 +0800 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> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent 3191813 commit 05b38a7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

block/elevator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,6 @@ int elevator_switch(struct request_queue *q, const char *name)
676676
*/
677677
static int elevator_change(struct request_queue *q, const char *elevator_name)
678678
{
679-
/* Make sure queue is not in the middle of being removed */
680-
if (!blk_queue_registered(q))
681-
return -ENOENT;
682-
683679
if (q->elevator && elevator_match(q->elevator->type, elevator_name))
684680
return 0;
685681

@@ -708,6 +704,10 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,
708704
struct request_queue *q = disk->queue;
709705
struct blk_mq_tag_set *set = q->tag_set;
710706

707+
/* Make sure queue is not in the middle of being removed */
708+
if (!blk_queue_registered(q))
709+
return -ENOENT;
710+
711711
/*
712712
* If the attribute needs to load a module, do it before freezing the
713713
* queue to ensure that the module file can be read when the request

0 commit comments

Comments
 (0)