diff options
| author |   Christoph Hellwig <hch@lst.de> | 2025-01-31 13:00:40 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2025-02-24 16:17:56 -0700 |
| commit | f6f9e32fe1e454ae8ac0190b2c2bd6074914beec (patch) | |
| tree | f5c607a15b89ed54211c36b1eaf52930c8abdf85 | |
| parent | loop: set LO_FLAGS_DIRECT_IO in loop_assign_backing_file (diff) | |
| download | wireguard-linux-f6f9e32fe1e454ae8ac0190b2c2bd6074914beec.tar.xz wireguard-linux-f6f9e32fe1e454ae8ac0190b2c2bd6074914beec.zip | |
loop: check in LO_FLAGS_DIRECT_IO in loop_default_blocksize
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1ee675d28d25..d3c0cc377ed9 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -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; } |