From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36C8DC31E5B for ; Tue, 18 Jun 2019 16:10:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F53C20B1F for ; Tue, 18 Jun 2019 16:10:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F53C20B1F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdGgQ-0005m3-6S for qemu-devel@archiver.kernel.org; Tue, 18 Jun 2019 12:10:06 -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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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, uin= t64_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, p= erm, @@ -2796,6 +2798,7 @@ static int raw_check_perm(BlockDriverState *bs, uin= t64_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, uint= 64_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