[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after error |
Date: |
Tue, 6 Apr 2010 15:30:14 +0200 |
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 <address@hidden>
---
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 ace3b85..639e05e 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -832,6 +832,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 2f34eec..11ce8d1 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.6.6.1
- [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 2/6] qcow2: Return 0/-errno in write_l2_entries, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 1/6] qcow2: Don't ignore immediate read/write failures, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after error,
Kevin Wolf <=
- [Qemu-devel] [PATCH 4/6] qcow2: Return 0/-errno in write_l1_entry, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 3/6] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 5/6] qcow2: Return 0/-errno in l2_allocate, Kevin Wolf, 2010/04/06
- Re: [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes, Aurelien Jarno, 2010/04/09