diff options
| author | Christoph Hellwig <hch@lst.de> | 2025-01-31 13:00:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-05-29 11:02:39 +0200 |
| commit | 20a53c3689a20a5e34b88fc7705b7f0bf883eb1c (patch) | |
| tree | f9027994e0bc919347c2a361983b5a2d6116c224 /drivers/block | |
| parent | 5b62f941eae80688aecbbbaed44b51cbb0fe1fa7 (diff) | |
| download | linux-20a53c3689a20a5e34b88fc7705b7f0bf883eb1c.tar.gz linux-20a53c3689a20a5e34b88fc7705b7f0bf883eb1c.tar.bz2 linux-20a53c3689a20a5e34b88fc7705b7f0bf883eb1c.zip | |
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>
Diffstat (limited to 'drivers/block')
| -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 6bd44ec2c9b1..fa9c77b8f4d2 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -916,7 +916,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; } |