Commit 4ce37fe0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

loop: also use the default block size from an underlying block device 



Fix the code in loop_reconfigure_limits to pick a default block size for
O_DIRECT file descriptors to also work when the loop device sits on top
of a block device and not just on a regular file on a block device based
file system.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240617060532.127975-8-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a17ece76

drivers/block/loop.c

+7 −1
Original line number Diff line number Diff line
@@ -988,10 +988,16 @@ static int loop_reconfigure_limits(struct loop_device *lo, unsigned short bsize) 
{

	struct file *file = lo->lo_backing_file;

	struct inode *inode = file->f_mapping->host;

	struct block_device *backing_bdev = NULL;

	struct queue_limits lim;



	if (S_ISBLK(inode->i_mode))

		backing_bdev = I_BDEV(inode);

	else if (inode->i_sb->s_bdev)

		backing_bdev = inode->i_sb->s_bdev;



	if (!bsize)

		bsize = loop_default_blocksize(lo, inode->i_sb->s_bdev);

		bsize = loop_default_blocksize(lo, backing_bdev);



	lim = queue_limits_start_update(lo->lo_queue);

	lim.logical_block_size = bsize;