From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMBl-0005vV-08 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJMBj-0004hJ-Tw for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:23:52 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:53774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMBj-0004gq-Dq for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:23:51 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Oct 2011 10:18:30 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9R9Kdjc2359540 for ; Thu, 27 Oct 2011 20:20:39 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9R9NMjH007361 for ; Thu, 27 Oct 2011 20:23:22 +1100 From: Dong Xu Wang Date: Thu, 27 Oct 2011 17:22:28 +0800 Message-Id: <1319707348-21768-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] block: fix qcow2_co_flush deadlock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, wdongxu@cn.ibm.com, stefanha@linux.vnet.ibm.com, Dong Xu Wang If qcow2_cache_flush failed, s->lock will not be unlock. Signed-off-by: Dong Xu Wang --- block/qcow2.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index a181932..ef057d3 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1113,11 +1113,13 @@ static int qcow2_co_flush(BlockDriverState *bs) qemu_co_mutex_lock(&s->lock); ret = qcow2_cache_flush(bs, s->l2_table_cache); if (ret < 0) { + qemu_co_mutex_unlock(&s->lock); return ret; } ret = qcow2_cache_flush(bs, s->refcount_block_cache); if (ret < 0) { + qemu_co_mutex_unlock(&s->lock); return ret; } qemu_co_mutex_unlock(&s->lock); -- 1.7.5.4