| Message ID | 20240611051929.513387-4-hch@lst.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/26] sd: fix sd_is_zoned | expand |
On 6/11/24 2:19 PM, Christoph Hellwig wrote: > __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> > --- > drivers/block/loop.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/loop.c b/drivers/block/loop.c > index 93780f41646b75..93a49c40a31a71 100644 > --- a/drivers/block/loop.c > +++ b/drivers/block/loop.c > @@ -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 = 512; Nit: SECTOR_SIZE ? maybe ? > + lim.physical_block_size = 512; > + lim.io_min = 512; > + queue_limits_commit_update(lo->lo_queue, &lim); > + > invalidate_disk(lo->lo_disk); > loop_sysfs_exit(lo); > /* let user-space know about this change */ Otherwise, looks OK to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 93780f41646b75..93a49c40a31a71 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -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 = 512; + lim.physical_block_size = 512; + lim.io_min = 512; + queue_limits_commit_update(lo->lo_queue, &lim); + invalidate_disk(lo->lo_disk); loop_sysfs_exit(lo); /* let user-space know about this change */
__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> --- drivers/block/loop.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)