From: Xie Yongji <xieyongji@bytedance.com>
Date: Tue, 26 Oct 2021 14:40:13 +0000 (+0800)
Subject: nbd: Use blk_validate_block_size() to validate block size
X-Git-Tag: v5.16-rc1~216^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4318d6cd038472d13e08a54a9035863c8c160bd;p=thirdparty%2Fkernel%2Flinux.git

nbd: Use blk_validate_block_size() to validate block size

Use the block layer helper to validate block size instead
of open coding it.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Link: https://lore.kernel.org/r/20211026144015.188-3-xieyongji@bytedance.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 8922b8864487f..504c20a2f33e0 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -315,7 +315,8 @@ static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize,
 {
 	if (!blksize)
 		blksize = 1u << NBD_DEF_BLKSIZE_BITS;
-	if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize))
+
+	if (blk_validate_block_size(blksize))
 		return -EINVAL;
 
 	nbd->config->bytesize = bytesize;