[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/12] file-posix: Move check_hdev_writable() up
From: |
Kevin Wolf |
Subject: |
[PULL 10/12] file-posix: Move check_hdev_writable() up |
Date: |
Fri, 17 Jul 2020 14:55:08 +0200 |
We'll need to call it in raw_open_common(), so move the function to
avoid a forward declaration.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200717105426.51134-2-kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 66 +++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index ae8190edab..dd7dab07d6 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -425,6 +425,39 @@ static void raw_probe_alignment(BlockDriverState *bs, int
fd, Error **errp)
}
}
+static int check_hdev_writable(BDRVRawState *s)
+{
+#if defined(BLKROGET)
+ /* Linux block devices can be configured "read-only" using blockdev(8).
+ * This is independent of device node permissions and therefore open(2)
+ * with O_RDWR succeeds. Actual writes fail with EPERM.
+ *
+ * bdrv_open() is supposed to fail if the disk is read-only. Explicitly
+ * check for read-only block devices so that Linux block devices behave
+ * properly.
+ */
+ struct stat st;
+ int readonly = 0;
+
+ if (fstat(s->fd, &st)) {
+ return -errno;
+ }
+
+ if (!S_ISBLK(st.st_mode)) {
+ return 0;
+ }
+
+ if (ioctl(s->fd, BLKROGET, &readonly) < 0) {
+ return -errno;
+ }
+
+ if (readonly) {
+ return -EACCES;
+ }
+#endif /* defined(BLKROGET) */
+ return 0;
+}
+
static void raw_parse_flags(int bdrv_flags, int *open_flags, bool has_writers)
{
bool read_write = false;
@@ -3323,39 +3356,6 @@ static int hdev_probe_device(const char *filename)
return 0;
}
-static int check_hdev_writable(BDRVRawState *s)
-{
-#if defined(BLKROGET)
- /* Linux block devices can be configured "read-only" using blockdev(8).
- * This is independent of device node permissions and therefore open(2)
- * with O_RDWR succeeds. Actual writes fail with EPERM.
- *
- * bdrv_open() is supposed to fail if the disk is read-only. Explicitly
- * check for read-only block devices so that Linux block devices behave
- * properly.
- */
- struct stat st;
- int readonly = 0;
-
- if (fstat(s->fd, &st)) {
- return -errno;
- }
-
- if (!S_ISBLK(st.st_mode)) {
- return 0;
- }
-
- if (ioctl(s->fd, BLKROGET, &readonly) < 0) {
- return -errno;
- }
-
- if (readonly) {
- return -EACCES;
- }
-#endif /* defined(BLKROGET) */
- return 0;
-}
-
static void hdev_parse_filename(const char *filename, QDict *options,
Error **errp)
{
--
2.25.4
- [PULL 00/12] Block layer patches for 5.1.0-rc1, Kevin Wolf, 2020/07/17
- [PULL 01/12] vvfat: set status to odd fixes, Kevin Wolf, 2020/07/17
- [PULL 03/12] qemu-img resize: Require --shrink for shrinking all image formats, Kevin Wolf, 2020/07/17
- [PULL 05/12] iotests/030: Reduce job speed to make race less likely, Kevin Wolf, 2020/07/17
- [PULL 02/12] Remove VXHS block device, Kevin Wolf, 2020/07/17
- [PULL 06/12] nbd: make nbd_export_close_all() synchronous, Kevin Wolf, 2020/07/17
- [PULL 04/12] crypto: use a stronger private key for tests, Kevin Wolf, 2020/07/17
- [PULL 08/12] block: Require aligned image size to avoid assertion failure, Kevin Wolf, 2020/07/17
- [PULL 09/12] file-posix: Allow byte-aligned O_DIRECT with NFS, Kevin Wolf, 2020/07/17
- [PULL 07/12] iotests: test shutdown when bitmap is exported through NBD, Kevin Wolf, 2020/07/17
- [PULL 10/12] file-posix: Move check_hdev_writable() up,
Kevin Wolf <=
- [PULL 11/12] file-posix: Fix check_hdev_writable() with auto-read-only, Kevin Wolf, 2020/07/17
- [PULL 12/12] file-posix: Fix leaked fd in raw_open_common() error path, Kevin Wolf, 2020/07/17
- Re: [PULL 00/12] Block layer patches for 5.1.0-rc1, Peter Maydell, 2020/07/18