From patchwork Fri Jan 30 08:07:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 434767 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 41A9914027F for ; Fri, 30 Jan 2015 19:05:54 +1100 (AEDT) Received: from localhost ([::1]:35188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH6aL-0007l3-NJ for incoming@patchwork.ozlabs.org; Fri, 30 Jan 2015 03:05:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH6Zt-0007Uf-Oo for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH6Zp-0006YL-0b for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:21 -0500 Received: from [59.151.112.132] (port=62010 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH6Zo-0006XP-Gs for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:16 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="56876081" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Jan 2015 16:01:36 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t0U84PW9023295; Fri, 30 Jan 2015 16:04:25 +0800 Received: from [10.167.226.52] (10.167.226.52) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Fri, 30 Jan 2015 16:05:07 +0800 Message-ID: <54CB3BB4.80406@cn.fujitsu.com> Date: Fri, 30 Jan 2015 16:07:16 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: qemu-devl , Kevin Wolf , Stefan Hajnoczi X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH] quorum: don't share qiov X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the child touches qiov->iov, it will cause unexpected results. Signed-off-by: Wen Congyang --- block/quorum.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index cdc026c..ef0c1e9 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -165,6 +165,10 @@ static void quorum_aio_finalize(QuorumAIOCB *acb) qemu_vfree(acb->qcrs[i].buf); qemu_iovec_destroy(&acb->qcrs[i].qiov); } + } else { + for (i = 0; i <= acb->child_iter; i++) { + qemu_iovec_destroy(&acb->qcrs[i].qiov); + } } g_free(acb->qcrs); @@ -709,8 +713,12 @@ static BlockAIOCB *quorum_aio_writev(BlockDriverState *bs, cb, opaque); int i; + acb->child_iter = s->num_children - 1; for (i = 0; i < s->num_children; i++) { - acb->qcrs[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, qiov, + qemu_iovec_init(&acb->qcrs[i].qiov, acb->qiov->niov); + qemu_iovec_concat(&acb->qcrs[i].qiov, acb->qiov, 0, acb->qiov->size); + acb->qcrs[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, + &acb->qcrs[i].qiov, nb_sectors, &quorum_aio_cb, &acb->qcrs[i]); }