loop: Set correct device size when using LOOP_CONFIGURE
PATCH 1/1 loop: Set correct device size when using LOOP_CONFIGURE
The device size calculation was done before processing the loop configuration, which meant that the we set the size on the underlying block device incorrectly in case lo_offset/lo_sizelimit were set in the configuration. Delay computing the size until we've setup the device parameters correctly.
--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/loop.c +2 -2
@@ -1111,8 +1111,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, mapping = file->f_mapping; inode = mapping->host; - size =get_loop_size (lo, file); -if ((config->info.lo_flags & ~LOOP_CONFIGURE_SETTABLE_FLAGS ) !=0 ) { error = -EINVAL ; goto out_unlock;
@@ -1162,6 +1160,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,loop_update_rotational (lo);loop_update_dio (lo);loop_sysfs_init (lo); + + size =get_loop_size (lo, file);loop_set_size (lo, size); set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
Hi Martijn
Look good to me. feel free to add tested-by tag. Also, I have sent a patch to ltp to test this. as below
https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
Best Regards
Yang Xu
Quoted 36 lines
The device size calculation was done before processing the loop configuration, which meant that the we set the size on the underlying block device incorrectly in case lo_offset/lo_sizelimit were set in the configuration. Delay computing the size until we've setup the device parameters correctly.
Fixes 3448914e8cc5("loop: Add LOOP_CONFIGURE ioctl")Reported-by Lennart Poettering <[email protected]>Signed-off-by Martijn Coenen <[email protected]>--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/block/loop.c +2
-2@@ -1111,8 +1111,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, mapping = file->f_mapping; inode = mapping->host; - size =get_loop_size (lo, file); -if ((config->info.lo_flags & ~LOOP_CONFIGURE_SETTABLE_FLAGS ) !=0 ) { error = -EINVAL ; goto out_unlock;@@ -1162,6 +1160,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,loop_update_rotational (lo);loop_update_dio (lo);loop_sysfs_init (lo); + + size =get_loop_size (lo, file);loop_set_size (lo, size); set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
Quoted 5 lines · Martijn Coenen
The device size calculation was done before processing the loop configuration, which meant that the we set the size on the underlying block device incorrectly in case lo_offset/lo_sizelimit were set in the configuration. Delay computing the size until we've setup the device parameters correctly.
Applied, thanks.
Signature · 1 line
Jens Axboe