Commit 9423c653 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

loop: Don't bother validating blocksize 



The block queue limits validation does this for us now.

The loop_configure() -> WARN_ON_ONCE() call is dropped, as an invalid
block size would trigger this now. We don't want userspace to be able to
directly trigger WARNs.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Link: https://lore.kernel.org/r/20240708091651.177447-6-john.g.garry@oracle.com


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

drivers/block/loop.c

+1 −11
Original line number Diff line number Diff line
@@ -1038,12 +1038,6 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, 
		goto out_unlock;

	}



	if (config->block_size) {

		error = blk_validate_block_size(config->block_size);

		if (error)

			goto out_unlock;

	}



	error = loop_set_status_from_info(lo, &config->info);

	if (error)

		goto out_unlock;
@@ -1075,7 +1069,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, 
	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));



	error = loop_reconfigure_limits(lo, config->block_size);

	if (WARN_ON_ONCE(error))

	if (error)

		goto out_unlock;



	loop_update_dio(lo);
@@ -1447,10 +1441,6 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg) 
	if (lo->lo_state != Lo_bound)

		return -ENXIO;



	err = blk_validate_block_size(arg);

	if (err)

		return err;



	if (lo->lo_queue->limits.logical_block_size == arg)

		return 0;