Linux block layer
 help / color / mirror / Atom feed
From: SurajSonawane2415 <surajsonawane0215@gmail.com>
To: surajsonawane0215@gmail.com, axboe@kernel.dk
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	hch@infradead.org
Subject: [PATCH V2] block: Fix elevator_get_default() to check for null q->tag_set
Date: Mon,  7 Oct 2024 16:44:16 +0530	[thread overview]
Message-ID: <20241007111416.13814-1-surajsonawane0215@gmail.com> (raw)
In-Reply-To: <20241004123922.35834-1-surajsonawane0215@gmail.com>

Fix error "block/elevator.c:569 elevator_get_default() error:
we previously assumed 'q->tag_set' could be null (see line 565)".
Since 'q->tag_set' cannot be NULL for blk-mq queues,
remove the unnecessary check in both `elevator_get_default`
and `elv_support_iosched`. This simplifies the logic and
ensures correct assumptions about 'q->tag_set' in blk-mq queues.

Signed-off-by: SurajSonawane2415 <surajsonawane0215@gmail.com>
---
V1 -> V2:
- Remove unnecessary `q->tag_set` check in `elv_support_iosched` function.
- Remove `q->tag_set` check because blk-mq queues always have a valid tag set.

 block/elevator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 4122026b1..60497e3b2 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -551,7 +551,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;
 }
@@ -562,7 +562,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 &&
-- 
2.34.1


  parent reply	other threads:[~2024-10-07 11:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-04 12:39 [PATCH] block: Fix elevator_get_default() to check for null q->tag_set SurajSonawane2415
2024-10-07  5:53 ` Christoph Hellwig
2024-10-07 11:14 ` SurajSonawane2415 [this message]
2024-10-07 20:24   ` [PATCH V2] " Jens Axboe
2024-10-07 20:26   ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241007111416.13814-1-surajsonawane0215@gmail.com \
    --to=surajsonawane0215@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=hch@infradead.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox