loop: Simplify discard granularity calc

A bdev discard granularity is always at least SECTOR_SIZE, so don't check
for a zero value.

Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20241101092215.422428-1-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 7719858c49bb632698b139246f677a393cf061ba..f21f4254b03896f6ab3d39e06fa5a9aeeaba90c0 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -789,8 +789,7 @@ static void loop_config_discard(struct loop_device *lo,
                struct block_device *bdev = I_BDEV(inode);
 
                max_discard_sectors = bdev_write_zeroes_sectors(bdev);
-               granularity = bdev_discard_granularity(bdev) ?:
-                       bdev_physical_block_size(bdev);
+               granularity = bdev_discard_granularity(bdev);
 
        /*
         * We use punch hole to reclaim the free space used by the