From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCouT-0007YR-2w for qemu-devel@nongnu.org; Wed, 17 Oct 2018 12:43:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCouI-00048S-Hl for qemu-devel@nongnu.org; Wed, 17 Oct 2018 12:42:56 -0400 From: Kevin Wolf Date: Wed, 17 Oct 2018 18:41:58 +0200 Message-Id: <20181017164200.22344-8-kwolf@redhat.com> In-Reply-To: <20181017164200.22344-1-kwolf@redhat.com> References: <20181017164200.22344-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 7/9] gluster: Support auto-read-only option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org 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 --- 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); =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 us= e 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