From 82dc6c0bcecdcb367c53f53556b02eba97bcef46 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 9 Sep 2015 17:25:53 +0200 Subject: [PATCH 6/8] qcow2: Handle EAGAIN returned from update_refcount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-id: <1441819553-13687-2-git-send-email-mreitz@redhat.com> Patchwork-id: 67718 O-Subject: [RHEV-7.2 qemu-kvm-rhev PATCH] qcow2: Handle EAGAIN returned from update_refcount Bugzilla: 1254927 RH-Acked-by: Kevin Wolf RH-Acked-by: Laurent Vivier RH-Acked-by: Fam Zheng From: Jindřich Makovička Fixes a crash during image compression Signed-off-by: Jindřich Makovička Tested-by: Richard W.M. Jones Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi (cherry picked from commit 3e5feb6202149e8a963a33b911216e40d790f1d7) Signed-off-by: Max Reitz Signed-off-by: Miroslav Rezanina --- block/qcow2-refcount.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 63c0085..d4f3351 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -954,19 +954,21 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) } free_in_cluster = s->cluster_size - offset_into_cluster(s, offset); - if (!offset || free_in_cluster < size) { - int64_t new_cluster = alloc_clusters_noref(bs, s->cluster_size); - if (new_cluster < 0) { - return new_cluster; - } + do { + if (!offset || free_in_cluster < size) { + int64_t new_cluster = alloc_clusters_noref(bs, s->cluster_size); + if (new_cluster < 0) { + return new_cluster; + } - if (!offset || ROUND_UP(offset, s->cluster_size) != new_cluster) { - offset = new_cluster; + if (!offset || ROUND_UP(offset, s->cluster_size) != new_cluster) { + offset = new_cluster; + } } - } - assert(offset); - ret = update_refcount(bs, offset, size, 1, false, QCOW2_DISCARD_NEVER); + assert(offset); + ret = update_refcount(bs, offset, size, 1, false, QCOW2_DISCARD_NEVER); + } while (ret == -EAGAIN); if (ret < 0) { return ret; } -- 1.8.3.1