nvme: use blk_validate_block_size() for max LBA check

The block layer already has support to validates proper block sizes
with blk_validate_block_size(), we can leverage that as well.

No functional changes.

Signed-off-by: Luis Chamberlain <[email protected]>
Reviewed-by: John Garry <[email protected]>
Reviewed-by: Keith Busch <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d169a30eb935e034bfbb78d1a31751dbedf0e397..a970168a3014e665006ed5576017bd764652eaa8 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2034,7 +2034,7 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id,
         * or smaller than a sector size yet, so catch this early and don't
         * allow block I/O.
         */
-       if (head->lba_shift > PAGE_SHIFT || head->lba_shift < SECTOR_SHIFT) {
+       if (blk_validate_block_size(bs)) {
                bs = (1 << 9);
                valid = false;
        }