[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 08/11] gluster: Support auto-read-only option
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v4 08/11] gluster: Support auto-read-only option |
Date: |
Fri, 19 Oct 2018 18:30:12 +0200 |
If read-only=off, but auto-read-only=on is given, open the file
read-write if we have the permissions, but instead of erroring out for
read-only files, just degrade to read-only.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Niels de Vos <address@hidden>
---
block/gluster.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/block/gluster.c b/block/gluster.c
index 4fd55a9cc5..5e300c96c8 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -849,8 +849,16 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict
*options,
qemu_gluster_parse_flags(bdrv_flags, &open_flags);
s->fd = glfs_open(s->glfs, gconf->path, open_flags);
- if (!s->fd) {
- ret = -errno;
+ ret = s->fd ? 0 : -errno;
+
+ if (ret == -EACCES || ret == -EROFS) {
+ /* Try to degrade to read-only, but if it doesn't work, still use the
+ * normal error message. */
+ if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
+ open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
+ s->fd = glfs_open(s->glfs, gconf->path, open_flags);
+ ret = s->fd ? 0 : -errno;
+ }
}
s->supports_seek_data = qemu_gluster_test_seek(s->fd);
--
2.19.1
- [Qemu-block] [PATCH v4 00/11] block: Add auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 01/11] block: Update flags in bdrv_set_read_only(), Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 02/11] block: Add auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 04/11] block: Require auto-read-only for existing fallbacks, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 07/11] curl: Support auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 06/11] file-posix: Support auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 08/11] gluster: Support auto-read-only option,
Kevin Wolf <=
- [Qemu-block] [PATCH v4 05/11] nbd: Support auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 03/11] rbd: Close image in qemu_rbd_open() error path, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 09/11] iscsi: Support auto-read-only option, Kevin Wolf, 2018/10/19
- [Qemu-block] [PATCH v4 10/11] block: Make auto-read-only=on default for -drive, Kevin Wolf, 2018/10/20
- [Qemu-block] [PATCH v4 11/11] qemu-iotests: Test auto-read-only with -drive and -blockdev, Kevin Wolf, 2018/10/20
- Re: [Qemu-block] [PATCH v4 00/11] block: Add auto-read-only option, Kevin Wolf, 2018/10/31