loop: stop using loop_reconfigure_limits in __loop_clr_fd

__loop_clr_fd wants to clear all settings on the device.  Prepare for
moving more settings into the block limits by open coding
loop_reconfigure_limits.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 93780f41646b75cca0d572ee9a7c5e89a153e0b0..fd671028fa85547366a37ccb8aebceac7b8fc23d 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1133,6 +1133,7 @@ out_putf:
 
 static void __loop_clr_fd(struct loop_device *lo, bool release)
 {
+       struct queue_limits lim;
        struct file *filp;
        gfp_t gfp = lo->old_gfp_mask;
 
@@ -1156,7 +1157,14 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
        lo->lo_offset = 0;
        lo->lo_sizelimit = 0;
        memset(lo->lo_file_name, 0, LO_NAME_SIZE);
-       loop_reconfigure_limits(lo, 512, false);
+
+       /* reset the block size to the default */
+       lim = queue_limits_start_update(lo->lo_queue);
+       lim.logical_block_size = SECTOR_SIZE;
+       lim.physical_block_size = SECTOR_SIZE;
+       lim.io_min = SECTOR_SIZE;
+       queue_limits_commit_update(lo->lo_queue, &lim);
+
        invalidate_disk(lo->lo_disk);
        loop_sysfs_exit(lo);
        /* let user-space know about this change */