From 53b0ec70a73eda35a880200b6b56b406f3a2d7fe Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 4 May 2010 13:30:33 -0300 Subject: [PATCH 11/20] qcow2: Remove request from in-flight list after error RH-Author: Kevin Wolf Message-id: <1272979838-20032-5-git-send-email-kwolf@redhat.com> Patchwork-id: 8994 O-Subject: [RHEL-6 qemu-kvm PATCH 4/9] qcow2: Remove request from in-flight list after error Bugzilla: 588762 RH-Acked-by: Gleb Natapov RH-Acked-by: Juan Quintela RH-Acked-by: Christoph Hellwig Bugzilla: 588762 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 Signed-off-by: Aurelien Jarno (cherry picked from commit c644db3d53c90ef569ff5a90e9f821b88e7123bb) Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 1 + block/qcow2.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) Signed-off-by: Eduardo Habkost --- 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 9b3d686..8cb4b38 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -825,6 +825,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 149433a..d766238 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -628,11 +628,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); -- 1.7.0.3