From patchwork Thu Apr 20 09:42:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 752730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w7v6s6b1rz9s7F for ; Thu, 20 Apr 2017 19:42:45 +1000 (AEST) Received: from localhost ([::1]:52685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d18br-0002Q8-7Z for incoming@patchwork.ozlabs.org; Thu, 20 Apr 2017 05:42:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d18bW-0002OE-Br for qemu-devel@nongnu.org; Thu, 20 Apr 2017 05:42:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d18bV-0002nw-Dp for qemu-devel@nongnu.org; Thu, 20 Apr 2017 05:42:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d18bQ-0002lR-N0; Thu, 20 Apr 2017 05:42:16 -0400 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 7F4EC9F72A; Thu, 20 Apr 2017 09:42:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7F4EC9F72A Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7F4EC9F72A Received: from localhost (ovpn-8-22.pek2.redhat.com [10.72.8.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC60782791; Thu, 20 Apr 2017 09:42:14 +0000 (UTC) Date: Thu, 20 Apr 2017 17:42:12 +0800 From: Fam Zheng To: qemu-devel@nongnu.org Message-ID: <20170420094212.GI24486@lemon.lan> References: <20170420075237.18219-1-famz@redhat.com> <20170420075237.18219-20-famz@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170420075237.18219-20-famz@redhat.com> User-Agent: Mutt/1.8.0 (2017-02-23) 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.39]); Thu, 20 Apr 2017 09:42:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v13 19/20] file-posix: Add image locking in perm operations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On Thu, 04/20 15:52, Fam Zheng wrote: > virtlockd in libvirt locks the first byte, so we start looking at the > file bytes from 0x10. > > The complication is in the transactional interface. To make the reopen > logic managable, and allow better reuse, the code is internally > organized with a table from old mode to the new one. > > Signed-off-by: Fam Zheng > --- > block/file-posix.c | 744 ++++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 741 insertions(+), 3 deletions(-) Need to squash this in to fix the patchew make check error on centos 6: diff --git a/block/file-posix.c b/block/file-posix.c index b85ac9c..f1563ae 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1069,7 +1069,7 @@ static int raw_handle_lock_update(BlockDriverState *bs, int lock_fd; if (!RAW_LOCK_SUPPORTED) { - return 0; + goto cleanup; } if (bdrv_get_flags(bs) & BDRV_O_INACTIVE) {