loop: check in LO_FLAGS_DIRECT_IO in loop_default_blocksize

[ Upstream commit f6f9e32fe1e454ae8ac0190b2c2bd6074914beec ]

We can't go below the minimum direct I/O size no matter if direct I/O is
enabled by passing in an O_DIRECT file descriptor or due to the explicit
flag.  Now that LO_FLAGS_DIRECT_IO is set earlier after assigning a
backing file, loop_default_blocksize can check it instead of the
O_DIRECT flag to handle both conditions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250131120120.1315125-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 1e5ef09cdde68197bb97c7b2c2ed73367edc8328..f68f86e9cb716be3e0382505fbd6e49b4bd251b6 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -920,7 +920,7 @@ static unsigned int loop_default_blocksize(struct loop_device *lo,
                struct block_device *backing_bdev)
 {
        /* In case of direct I/O, match underlying block size */
-       if ((lo->lo_backing_file->f_flags & O_DIRECT) && backing_bdev)
+       if ((lo->lo_flags & LO_FLAGS_DIRECT_IO) && backing_bdev)
                return bdev_logical_block_size(backing_bdev);
        return SECTOR_SIZE;
 }