loop: Use bdev limit helpers for configuring discard

Instead of directly looking at the request_queue limits, use the bdev
limits helpers, which is preferable.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20241030111900.3981223-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 78a7bb28defe4cb6e41019cdda07ef88701eb345..7719858c49bb632698b139246f677a393cf061ba 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -786,11 +786,11 @@ static void loop_config_discard(struct loop_device *lo,
         * file-backed loop devices: discarded regions read back as zero.
         */
        if (S_ISBLK(inode->i_mode)) {
-               struct request_queue *backingq = bdev_get_queue(I_BDEV(inode));
+               struct block_device *bdev = I_BDEV(inode);
 
-               max_discard_sectors = backingq->limits.max_write_zeroes_sectors;
-               granularity = bdev_discard_granularity(I_BDEV(inode)) ?:
-                       queue_physical_block_size(backingq);
+               max_discard_sectors = bdev_write_zeroes_sectors(bdev);
+               granularity = bdev_discard_granularity(bdev) ?:
+                       bdev_physical_block_size(bdev);
 
        /*
         * We use punch hole to reclaim the free space used by the