From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz8Fj-0002Mp-R3 for qemu-devel@nongnu.org; Thu, 01 Sep 2011 10:28:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qz8Fg-0008HM-Sm for qemu-devel@nongnu.org; Thu, 01 Sep 2011 10:28:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz8Fg-0008H3-FY for qemu-devel@nongnu.org; Thu, 01 Sep 2011 10:28:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p81ESJEi018458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 1 Sep 2011 10:28:19 -0400 From: Kevin Wolf Date: Thu, 1 Sep 2011 16:31:10 +0200 Message-Id: <1314887471-18052-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1314887471-18052-1-git-send-email-kwolf@redhat.com> References: <1314887471-18052-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] qcow2: Fix error cases to run depedent requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, lcapitulino@redhat.com Requests depending on a failed request would end up waiting forever. This fixes the error path to continue dependent requests even when the request has failed. Signed-off-by: Kevin Wolf --- block/qcow2.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index f26f7b6..8aed310 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -593,13 +593,12 @@ static int qcow2_co_writev(BlockDriverState *bs, } ret = qcow2_alloc_cluster_link_l2(bs, &l2meta); - - run_dependent_requests(s, &l2meta); - if (ret < 0) { goto fail; } + run_dependent_requests(s, &l2meta); + remaining_sectors -= cur_nr_sectors; sector_num += cur_nr_sectors; bytes_done += cur_nr_sectors * 512; @@ -607,6 +606,8 @@ static int qcow2_co_writev(BlockDriverState *bs, ret = 0; fail: + run_dependent_requests(s, &l2meta); + qemu_co_mutex_unlock(&s->lock); qemu_iovec_destroy(&hd_qiov); -- 1.7.6