summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorSurajSonawane2415 <surajsonawane0215@gmail.com>2024-10-07 16:44:16 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-11-17 15:08:56 +0100
commitf49a9d86c4cd2f901544f46e5a77e8009d2a18d0 (patch)
tree80cd221206c59854d99c62d70f7bb24dacd9b61f /block
parent975cb1d2121511584695d0e47fdb90e6782da007 (diff)
downloadlinux-f49a9d86c4cd2f901544f46e5a77e8009d2a18d0.tar.gz
linux-f49a9d86c4cd2f901544f46e5a77e8009d2a18d0.tar.bz2
linux-f49a9d86c4cd2f901544f46e5a77e8009d2a18d0.zip
block: Fix elevator_get_default() checking for NULL q->tag_set
[ 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>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 5ff093cb3cf8..ba072d8f660e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(elv_unregister);
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;
}
@@ -569,7 +569,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 &&