|
 |
26ba25 |
From 6508e23a5053680509754d719a19b04754e1fbdc Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Thu, 10 Jan 2019 12:44:38 +0000
|
|
|
26ba25 |
Subject: [PATCH 08/14] gluster: Support auto-read-only option
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20190110124442.30132-9-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 83959
|
|
|
26ba25 |
O-Subject: [RHEL-8.0 qemu-kvm PATCH 08/12] gluster: Support auto-read-only option
|
|
|
26ba25 |
Bugzilla: 1644996
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
If read-only=off, but auto-read-only=on is given, open the file
|
|
|
26ba25 |
read-write if we have the permissions, but instead of erroring out for
|
|
|
26ba25 |
read-only files, just degrade to read-only.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 54ea21bd16202c4a3e43c67b573b5d1aa2ec1c0c)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
block/gluster.c | 12 ++++++++++--
|
|
|
26ba25 |
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/block/gluster.c b/block/gluster.c
|
|
|
26ba25 |
index cecfe09..8c13002 100644
|
|
|
26ba25 |
--- a/block/gluster.c
|
|
|
26ba25 |
+++ b/block/gluster.c
|
|
|
26ba25 |
@@ -849,8 +849,16 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options,
|
|
|
26ba25 |
qemu_gluster_parse_flags(bdrv_flags, &open_flags);
|
|
|
26ba25 |
|
|
|
26ba25 |
s->fd = glfs_open(s->glfs, gconf->path, open_flags);
|
|
|
26ba25 |
- if (!s->fd) {
|
|
|
26ba25 |
- ret = -errno;
|
|
|
26ba25 |
+ ret = s->fd ? 0 : -errno;
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ if (ret == -EACCES || ret == -EROFS) {
|
|
|
26ba25 |
+ /* Try to degrade to read-only, but if it doesn't work, still use the
|
|
|
26ba25 |
+ * normal error message. */
|
|
|
26ba25 |
+ if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
|
|
|
26ba25 |
+ open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
|
|
|
26ba25 |
+ s->fd = glfs_open(s->glfs, gconf->path, open_flags);
|
|
|
26ba25 |
+ ret = s->fd ? 0 : -errno;
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
s->supports_seek_data = qemu_gluster_test_seek(s->fd);
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|