From: Martin George <martinus.gpy@gmail.com>
Date: Mon, 22 Sep 2025 12:05:32 +0000 (+0530)
Subject: nvme-core: use nvme_is_io_ctrl() for I/O controller check
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80e653fab6676fdcdfe2710cab5fc4312ac47edd;p=thirdparty%2Fkernel%2Fstable.git

nvme-core: use nvme_is_io_ctrl() for I/O controller check

Replace the current I/O controller check in
nvme_init_non_mdts_limits() with the helper nvme_is_io_ctrl()
function to maintain consistency with similar checks in other
parts of the code and improve code readability.

Signed-off-by: Martin George <marting@netapp.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index edfe7a267a4b6..a46f0f2d1c377 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3370,7 +3370,7 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
 	else
 		ctrl->max_zeroes_sectors = 0;
 
-	if (ctrl->subsys->subtype != NVME_NQN_NVME ||
+	if (!nvme_is_io_ctrl(ctrl) ||
 	    !nvme_id_cns_ok(ctrl, NVME_ID_CNS_CS_CTRL) ||
 	    test_bit(NVME_CTRL_SKIP_ID_CNS_CS, &ctrl->flags))
 		return 0;