From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrty-0004Cp-KS for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKrtx-0004Bv-CR for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrtx-0004Bf-2c for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:45 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:29:48 +0100 Message-Id: <1320067830-12093-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 13/55] block: fix qcow2_co_flush deadlock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Dong Xu Wang If qcow2_cache_flush failed, s->lock will not be unlock. Signed-off-by: Dong Xu Wang Signed-off-by: Kevin Wolf --- 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.6.4