]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
block: remove a duplicate io_min check in blk_validate_limits
authorChristoph Hellwig <hch@lst.de>
Mon, 1 Jul 2024 05:17:50 +0000 (07:17 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 1 Jul 2024 12:52:42 +0000 (06:52 -0600)
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>
block/blk-settings.c

index 2e559cf97cc8346ec4d80343ca7a412be700cc45..ff8bbc101fedaa6d1612687abf571474cdc55fb7 100644 (file)
@@ -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 {