From patchwork Fri Jun 3 08:49:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 9152329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CCB060221 for ; Fri, 3 Jun 2016 09:15:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D368282EE for ; Fri, 3 Jun 2016 09:15:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3215528309; Fri, 3 Jun 2016 09:15:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D05F4282EE for ; Fri, 3 Jun 2016 09:15:19 +0000 (UTC) Received: from localhost ([::1]:53550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8lCI-0005uf-69 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Jun 2016 05:15:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8koP-0007XY-IC for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8koJ-00022x-CS for qemu-devel@nongnu.org; Fri, 03 Jun 2016 04:50:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8koA-00021U-UT; Fri, 03 Jun 2016 04:50:23 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73778C05B1CF; Fri, 3 Jun 2016 08:50:22 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-15-133.nay.redhat.com [10.66.15.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u538nKY0023508; Fri, 3 Jun 2016 04:50:18 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 3 Jun 2016 16:49:08 +0800 Message-Id: <1464943756-14143-15-git-send-email-famz@redhat.com> In-Reply-To: <1464943756-14143-1-git-send-email-famz@redhat.com> References: <1464943756-14143-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 03 Jun 2016 08:50:22 +0000 (UTC) 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] [PATCH v6 14/22] mirror: Disable image locking on target backing chain 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, rjones@redhat.com, John Snow , Jeff Cody , Markus Armbruster , Max Reitz , stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In sync=none the backing image of s->target is s->common.bs, which could be exclusively locked, the image locking wouldn't work here. Later we can update completion code to lock it after the replaced node has dropped its lock. Signed-off-by: Fam Zheng --- blockdev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index fa8b50c..4a9fa7c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3620,8 +3620,14 @@ void qmp_drive_mirror(const char *device, const char *target, /* Mirroring takes care of copy-on-write using the source's backing * file. */ - target_bs = bdrv_open(target, NULL, options, flags | BDRV_O_NO_BACKING, - errp); + flags |= BDRV_O_NO_BACKING; + if (sync == MIRROR_SYNC_MODE_NONE) { + /* TODO: in mirror complete, after target_bs is switched to and the + * original BDS's lock is dropped, we should enable the lock on + * target_bs. */ + flags |= BDRV_O_NO_LOCK; + } + target_bs = bdrv_open(target, NULL, options, flags, errp); if (!target_bs) { goto out; }