From nobody Wed Dec 17 05:37:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560874211; cv=none; d=zoho.com; s=zohoarc; b=cJorsiIowcVlJQCPx1I//RRIXe7SNbjIwJmnVdji/5bfSrSUQGVcm5lMN2/5VC8N2wUDfl8SRF83pjnlALn22CABlX4MKhzznqIpLazA59Lm6taX94dGf38sQAcCEaLMWiKCmh6P/Z2m4K4WHlMo4kf5phFlryeemebpubJspmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560874211; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=0PMXS5LBk4j6oKo0d5h8iqsN5isFiyBfW4h2YshbZvE=; b=TgFjZAGY16okvjEJYrkcZQpZM+yF1YQ90PIPGyr96AWiXNP5U4TuLOfGRh+CtFDuGsOD6IqKC1Ef5Tod8WibvCx4Lhv1g+po8vtU0nICTSRyL5Gkz3h4H9TxgJXN0tUJEA95ItLSGEzfRGhgmztT7mAKtKjMzFsiPpsCWFe4c34= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560874211622594.156853862057; Tue, 18 Jun 2019 09:10:11 -0700 (PDT) Received: from localhost ([::1]:59360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdGgU-0005m3-Gz for importer@patchew.org; Tue, 18 Jun 2019 12:10:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56038) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdFxa-000843-0w for qemu-devel@nongnu.org; Tue, 18 Jun 2019 11:23:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdFxX-0000oF-4x for qemu-devel@nongnu.org; Tue, 18 Jun 2019 11:23:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdFxQ-0000Vq-RZ; Tue, 18 Jun 2019 11:23:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 40216307D921; Tue, 18 Jun 2019 15:23:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-185.ams2.redhat.com [10.36.116.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61D9919492; Tue, 18 Jun 2019 15:23:30 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 18 Jun 2019 17:23:10 +0200 Message-Id: <20190618152318.24953-7-kwolf@redhat.com> In-Reply-To: <20190618152318.24953-1-kwolf@redhat.com> References: <20190618152318.24953-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 18 Jun 2019 15:23:31 +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 06/14] file-posix: Update open_flags in raw_set_perm() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Max Reitz raw_check_perm() + raw_set_perm() can change the flags associated with the current FD. If so, we have to update BDRVRawState.open_flags accordingly. Otherwise, we may keep reopening the FD even though the current one already has the correct flags. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/file-posix.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 83ab1b78ef..ab05b51a66 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -146,6 +146,7 @@ typedef struct BDRVRawState { uint64_t locked_shared_perm; =20 int perm_change_fd; + int perm_change_flags; BDRVReopenState *reopen_state; =20 #ifdef CONFIG_XFS @@ -2788,6 +2789,7 @@ static int raw_check_perm(BlockDriverState *bs, uint6= 4_t perm, uint64_t shared, assert(s->reopen_state->shared_perm =3D=3D shared); rs =3D s->reopen_state->opaque; s->perm_change_fd =3D rs->fd; + s->perm_change_flags =3D rs->open_flags; } else { /* We may need a new fd if auto-read-only switches the mode */ ret =3D raw_reconfigure_getfd(bs, bs->open_flags, &open_flags, per= m, @@ -2796,6 +2798,7 @@ static int raw_check_perm(BlockDriverState *bs, uint6= 4_t perm, uint64_t shared, return ret; } else if (ret !=3D s->fd) { s->perm_change_fd =3D ret; + s->perm_change_flags =3D open_flags; } } =20 @@ -2834,6 +2837,7 @@ static void raw_set_perm(BlockDriverState *bs, uint64= _t perm, uint64_t shared) if (s->perm_change_fd && s->fd !=3D s->perm_change_fd) { qemu_close(s->fd); s->fd =3D s->perm_change_fd; + s->open_flags =3D s->perm_change_flags; } s->perm_change_fd =3D 0; =20 --=20 2.20.1