| From af3c570fb0df422b4906ebd11c1bf363d89961d5 Mon Sep 17 00:00:00 2001 |
| From: Xie Yongji <xieyongji@bytedance.com> |
| Date: Tue, 26 Oct 2021 22:40:14 +0800 |
| Subject: loop: Use blk_validate_block_size() to validate block size |
| |
| From: Xie Yongji <xieyongji@bytedance.com> |
| |
| commit af3c570fb0df422b4906ebd11c1bf363d89961d5 upstream. |
| |
| 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> |
| Cc: Tadeusz Struk <tadeusz.struk@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/block/loop.c | 17 ++--------------- |
| 1 file changed, 2 insertions(+), 15 deletions(-) |
| |
| --- a/drivers/block/loop.c |
| +++ b/drivers/block/loop.c |
| @@ -273,19 +273,6 @@ static void __loop_update_dio(struct loo |
| } |
| |
| /** |
| - * 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 |
| * @size: new size of the loop device |
| @@ -1235,7 +1222,7 @@ static int loop_configure(struct loop_de |
| } |
| |
| 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; |
| } |
| @@ -1761,7 +1748,7 @@ static int loop_set_block_size(struct lo |
| if (lo->lo_state != Lo_bound) |
| return -ENXIO; |
| |
| - err = loop_validate_block_size(arg); |
| + err = blk_validate_block_size(arg); |
| if (err) |
| return err; |
| |
