From patchwork Fri Apr 9 09:46:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 49801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 02AD4B7CF6 for ; Fri, 9 Apr 2010 20:07:58 +1000 (EST) Received: from localhost ([127.0.0.1]:56306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0B7z-0001Qz-4Z for incoming@patchwork.ozlabs.org; Fri, 09 Apr 2010 06:07:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0AoH-0004OP-6c for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:33 -0400 Received: from [140.186.70.92] (port=44340 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0AoE-0004Mz-Ib for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0AoB-0005z9-0M for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51327) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0AoA-0005yv-H9 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:26 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o399lL3F020416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Apr 2010 05:47:21 -0400 Received: from localhost.localdomain (vpn1-4-18.ams2.redhat.com [10.36.4.18]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o399kvEM009943; Fri, 9 Apr 2010 05:47:19 -0400 From: Kevin Wolf To: aurelien@aurel32.net Date: Fri, 9 Apr 2010 11:46:28 +0200 Message-Id: <1270806388-28138-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1270806388-28138-1-git-send-email-kwolf@redhat.com> References: <1270806388-28138-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If we complete a request with a failure we need to remove it from the list of requests that are in flight. If we don't do it, the next time the same AIOCB is used for a cluster allocation it will create a loop in the list and qemu will hang in an endless loop. Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 1 + block/qcow2.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index b13b693..c7057b1 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -811,6 +811,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, cluster_offset = qcow2_alloc_clusters(bs, nb_clusters * s->cluster_size); if (cluster_offset < 0) { + QLIST_REMOVE(m, next_in_flight); return cluster_offset; } diff --git a/block/qcow2.c b/block/qcow2.c index f6f8980..5d33d6c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -624,11 +624,15 @@ static void qcow_aio_write_cb(void *opaque, int ret) qcow_aio_write_cb, acb); if (acb->hd_aiocb == NULL) { ret = -EIO; - goto done; + goto fail; } return; +fail: + if (acb->l2meta.nb_clusters != 0) { + QLIST_REMOVE(&acb->l2meta, next_in_flight); + } done: if (acb->qiov->niov > 1) qemu_vfree(acb->orig_buf);