]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
loop: check in LO_FLAGS_DIRECT_IO in loop_default_blocksize
authorChristoph Hellwig <hch@lst.de>
Fri, 31 Jan 2025 12:00:40 +0000 (13:00 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 24 Feb 2025 23:17:56 +0000 (16:17 -0700)
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>
drivers/block/loop.c

index 1ee675d28d25aaf1068f7b7f9c05c54955d8f3b3..d3c0cc377ed9bee6655eceb15fc0c1d102a37b22 100644 (file)
@@ -980,7 +980,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;
 }