block: remove the discard_granularity check in __blkdev_issue_discard

We now set a default granularity in the queue limits API, so don't
bother with this extra check.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240506042027.2289826-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-lib.c b/block/blk-lib.c
index a6954eafb8c8af324971bd2d293fdceb2d481303..7ec3e170e7f6292052715f49a5a6c4a83a32535e 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -46,13 +46,6 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
        if (!bdev_max_discard_sectors(bdev))
                return -EOPNOTSUPP;
 
-       /* In case the discard granularity isn't set by buggy device driver */
-       if (WARN_ON_ONCE(!bdev_discard_granularity(bdev))) {
-               pr_err_ratelimited("%pg: Error: discard_granularity is 0.\n",
-                                  bdev);
-               return -EOPNOTSUPP;
-       }
-
        bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
        if ((sector | nr_sects) & bs_mask)
                return -EINVAL;