| Message ID | 20240307151157.466013-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] block: remove the discard_granularity check in __blkdev_issue_discard | expand |
diff --git a/block/blk-lib.c b/block/blk-lib.c index dc8e35d0a51d6d..f873eb9a886f63 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -66,13 +66,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;
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> --- block/blk-lib.c | 7 ------- 1 file changed, 7 deletions(-)