]> git.hungrycats.org Git - linux/commitdiff
block: Fix elevator_get_default() checking for NULL q->tag_set
authorSurajSonawane2415 <surajsonawane0215@gmail.com>
Mon, 7 Oct 2024 11:14:16 +0000 (16:44 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Nov 2024 14:07:20 +0000 (15:07 +0100)
[ Upstream commit b402328a24ee7193a8ab84277c0c90ae16768126 ]

elevator_get_default() and elv_support_iosched() both check for whether
or not q->tag_set is non-NULL, however it's not possible for them to be
NULL. This messes up some static checkers, as the checking of tag_set
isn't consistent.

Remove the checks, which both simplifies the logic and avoids checker
errors.

Signed-off-by: SurajSonawane2415 <surajsonawane0215@gmail.com>
Link: https://lore.kernel.org/r/20241007111416.13814-1-surajsonawane0215@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
block/elevator.c

index bd71f0fc4e4b6725687da123cab3563a7370d18b..06288117e2dd6d2259fac4185b4b92d651d46acd 100644 (file)
@@ -624,7 +624,7 @@ out:
 static inline bool elv_support_iosched(struct request_queue *q)
 {
        if (!queue_is_mq(q) ||
-           (q->tag_set && (q->tag_set->flags & BLK_MQ_F_NO_SCHED)))
+           (q->tag_set->flags & BLK_MQ_F_NO_SCHED))
                return false;
        return true;
 }
@@ -635,7 +635,7 @@ static inline bool elv_support_iosched(struct request_queue *q)
  */
 static struct elevator_type *elevator_get_default(struct request_queue *q)
 {
-       if (q->tag_set && q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
+       if (q->tag_set->flags & BLK_MQ_F_NO_SCHED_BY_DEFAULT)
                return NULL;
 
        if (q->nr_hw_queues != 1 &&