From: Xie Yongji <xieyongji@bytedance.com>
To: axboe@kernel.dk, hch@lst.de, josef@toxicpanda.com,
mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com,
kwolf@redhat.com
Cc: linux-block@vger.kernel.org, nbd@other.debian.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH 3/4] loop: Use blk_validate_block_size() to validate block size
Date: Mon, 25 Oct 2021 17:43:05 +0800 [thread overview]
Message-ID: <20211025094306.97-4-xieyongji@bytedance.com> (raw)
In-Reply-To: <20211025094306.97-1-xieyongji@bytedance.com>
Remove loop_validate_block_size() and use the block layer helper
to validate block size.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
drivers/block/loop.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 7bf4686af774..dfc72a1f6500 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -273,19 +273,6 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
}
/**
- * 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
@@ -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;
}
@@ -1759,7 +1746,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;
--
2.11.0
next prev parent reply other threads:[~2021-10-25 9:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 9:43 [PATCH 0/4] Add blk_validate_block_size() helper for drivers to validate block size Xie Yongji
2021-10-25 9:43 ` [PATCH 1/4] block: Add a helper to validate the " Xie Yongji
2021-10-25 9:43 ` [PATCH 2/4] nbd: Use blk_validate_block_size() to validate " Xie Yongji
2021-10-25 9:43 ` Xie Yongji [this message]
2021-10-25 9:43 ` [PATCH 4/4] virtio-blk: " Xie Yongji
2021-10-25 13:19 ` Michael S. Tsirkin
2021-10-25 13:47 ` Yongji Xie
2021-10-25 17:21 ` Michael S. Tsirkin
2021-10-26 14:37 ` Yongji Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211025094306.97-4-xieyongji@bytedance.com \
--to=xieyongji@bytedance.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=jasowang@redhat.com \
--cc=josef@toxicpanda.com \
--cc=kwolf@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=mst@redhat.com \
--cc=nbd@other.debian.org \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).