[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error |
Date: |
Fri, 9 Apr 2010 11:46:28 +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 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);
--
1.6.6.1
- [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malformed input, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 02/10] block: avoid creating too large iovecs in multiwrite_merge, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 06/10] block: Fix multiwrite error handling, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 03/10] qcow2: Factor next_refcount_table_size out, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 04/10] qcow2: Rewrite alloc_refcount_block/grow_refcount_table, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error,
Kevin Wolf <=
- [Qemu-devel] [STABLE][PATCH 09/10] qcow2: Don't ignore immediate read/write failures, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 07/10] block: Fix error code in multiwrite for immediate failures, Kevin Wolf, 2010/04/09
- Re: [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Aurelien Jarno, 2010/04/09