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: Xie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20211026144015.188-4-xieyongji@bytedance.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 980b538c008af75cb293ddd4be758b46a8870868..ab23bbc467e7cffc7d871e18520952a99f5c4f25 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -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;