Commit af3c570f authored by Xie Yongji's avatar Xie Yongji Committed by Jens Axboe
Browse files

loop: Use blk_validate_block_size() to validate block size 



Remove loop_validate_block_size() and use the block layer helper
to validate block size.

Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20211026144015.188-4-xieyongji@bytedance.com


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

drivers/block/loop.c

+2 −15
Original line number Diff line number Diff line
@@ -272,19 +272,6 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) 
		blk_mq_unfreeze_queue(lo->lo_queue);

}



/**

 * loop_validate_block_size() - validates the passed in block size

 * @bsize: size to validate

 */

static int

loop_validate_block_size(unsigned short bsize)

{

	if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))

		return -EINVAL;



	return 0;

}



/**

 * loop_set_size() - sets device size and notifies userspace

 * @lo: struct loop_device to set the size for
@@ -1236,7 +1223,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, 
	}



	if (config->block_size) {

		error = loop_validate_block_size(config->block_size);

		error = blk_validate_block_size(config->block_size);

		if (error)

			goto out_unlock;

	}
@@ -1752,7 +1739,7 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg) 
	if (lo->lo_state != Lo_bound)

		return -ENXIO;



	err = loop_validate_block_size(arg);

	err = blk_validate_block_size(arg);

	if (err)

		return err;