From nobody Sun May 4 17:30:52 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1541437288612767.6363616453534;
Mon, 5 Nov 2018 09:01:28 -0800 (PST)
Received: from localhost ([::1]:36306 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1gJiFg-0007D9-Cp
for importer@patchew.org; Mon, 05 Nov 2018 12:01:24 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52439)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1gJhxk-0004N5-Ol
for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:42:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1gJhxj-00079O-Dt
for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:42:52 -0500
Received: from mx1.redhat.com ([209.132.183.28]:58524)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1gJhx6-0005J6-84; Mon, 05 Nov 2018 11:42:14 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 7459630026DA;
Mon, 5 Nov 2018 16:39:03 +0000 (UTC)
Received: from linux.fritz.box.com (ovpn-117-198.ams2.redhat.com
[10.36.117.198])
by smtp.corp.redhat.com (Postfix) with ESMTP id EF22A65F4C;
Mon, 5 Nov 2018 16:39:00 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Mon, 5 Nov 2018 17:37:34 +0100
Message-Id: <20181105163744.25139-27-kwolf@redhat.com>
In-Reply-To: <20181105163744.25139-1-kwolf@redhat.com>
References: <20181105163744.25139-1-kwolf@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.47]);
Mon, 05 Nov 2018 16:39:03 +0000 (UTC)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 26/36] gluster: Support auto-read-only option
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Type: text/plain; charset="utf-8"
If read-only=3Doff, but auto-read-only=3Don 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 <kwolf@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
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, QD=
ict *options,
qemu_gluster_parse_flags(bdrv_flags, &open_flags);
=20
s->fd =3D glfs_open(s->glfs, gconf->path, open_flags);
- if (!s->fd) {
- ret =3D -errno;
+ ret =3D s->fd ? 0 : -errno;
+
+ if (ret =3D=3D -EACCES || ret =3D=3D -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) =3D=3D 0) {
+ open_flags =3D (open_flags & ~O_RDWR) | O_RDONLY;
+ s->fd =3D glfs_open(s->glfs, gconf->path, open_flags);
+ ret =3D s->fd ? 0 : -errno;
+ }
}
=20
s->supports_seek_data =3D qemu_gluster_test_seek(s->fd);
--=20
2.19.1