From: Christoph Hellwig Date: Mon, 6 May 2024 04:20:22 +0000 (+0200) Subject: block: remove the discard_granularity check in __blkdev_issue_discard X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0942592045782e76a9d52c409955c2dc313cbd30;p=linux.git 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 Link: https://lore.kernel.org/r/20240506042027.2289826-2-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/block/blk-lib.c b/block/blk-lib.c index a6954eafb8c8a..7ec3e170e7f62 100644 --- 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;