From: Christoph Hellwig <hch@lst.de>
Date: Mon, 1 Jul 2024 05:17:50 +0000 (+0200)
Subject: block: remove a duplicate io_min check in blk_validate_limits
X-Git-Tag: v6.11-rc1~80^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f62e8edc0a9fda84fe5bf32d5f5874b489d6c301;p=thirdparty%2Fkernel%2Flinux.git

block: remove a duplicate io_min check in blk_validate_limits

If io_min is larger than the cap, it must by definition be non-zero.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240701051800.1245240-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 2e559cf97cc83..ff8bbc101feda 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -279,8 +279,7 @@ static int blk_validate_limits(struct queue_limits *lim)
 	} else if (lim->io_opt) {
 		lim->max_sectors =
 			min(max_hw_sectors, lim->io_opt >> SECTOR_SHIFT);
-	} else if (lim->io_min &&
-		   lim->io_min > (BLK_DEF_MAX_SECTORS_CAP << SECTOR_SHIFT)) {
+	} else if (lim->io_min > (BLK_DEF_MAX_SECTORS_CAP << SECTOR_SHIFT)) {
 		lim->max_sectors =
 			min(max_hw_sectors, lim->io_min >> SECTOR_SHIFT);
 	} else {