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

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240617060532.127975-5-hch@lst.de


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

drivers/block/loop.c

+9 −1
Original line number Diff line number Diff line
@@ -1133,6 +1133,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, 


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 */