block: add a bdev_discard_granularity helper

[platform/kernel/linux-starfive.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 8b4b66d..43aa4d7 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -12,8 +12,7 @@
 
 static sector_t bio_discard_limit(struct block_device *bdev, sector_t sector)
 {
-       unsigned int discard_granularity =
-               bdev_get_queue(bdev)->limits.discard_granularity;
+       unsigned int discard_granularity = bdev_discard_granularity(bdev);
        sector_t granularity_aligned_sector;
 
        if (bdev_is_partition(bdev))
@@ -59,7 +58,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
        }
 
        /* In case the discard granularity isn't set by buggy device driver */
-       if (WARN_ON_ONCE(!q->limits.discard_granularity)) {
+       if (WARN_ON_ONCE(!bdev_discard_granularity(bdev))) {
                char dev_name[BDEVNAME_SIZE];
 
                bdevname(bdev, dev_name);