From patchwork Mon May 7 08:51:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 157278 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F2BF6B6FA4 for ; Mon, 7 May 2012 18:51:32 +1000 (EST) Received: from localhost ([::1]:58433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRJfG-0004fj-U8 for incoming@patchwork.ozlabs.org; Mon, 07 May 2012 04:51:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRJf7-0004ew-Pe for qemu-devel@nongnu.org; Mon, 07 May 2012 04:51:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRJf3-0003qC-0T for qemu-devel@nongnu.org; Mon, 07 May 2012 04:51:21 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:33624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRJf2-0003pr-Pr for qemu-devel@nongnu.org; Mon, 07 May 2012 04:51:16 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 May 2012 02:51:15 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 7 May 2012 02:51:12 -0600 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 59EF9C90057 for ; Mon, 7 May 2012 04:51:09 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q478pBE420447412 for ; Mon, 7 May 2012 04:51:11 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q47EM3bd022454 for ; Mon, 7 May 2012 10:22:03 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q47ELxxN022101; Mon, 7 May 2012 10:22:01 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 7 May 2012 16:51:03 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 7 May 2012 16:51:03 +0800 Message-Id: <1336380663-29742-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12050708-2398-0000-0000-0000066BD1A2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.151 Cc: kwolf@redhat.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 2/2] qcow2: lock on prealloc 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 From: Zhi Yong Wu preallocate() will be locked. Signed-off-by: Zhi Yong Wu --- block/qcow2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 8c60a6f..ee4678f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1192,7 +1192,10 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* And if we're supposed to preallocate metadata, do that now */ if (prealloc) { + BDRVQcowState *s = bs->opaque; + qemu_co_mutex_lock(&s->lock); ret = preallocate(bs); + qemu_co_mutex_unlock(&s->lock); if (ret < 0) { goto out; }