From: Kevin Wolf Date: Tue, 11 Feb 2020 09:48:58 +0000 (+0100) Subject: qcow2: update_refcount(): Reset old_table_index after qcow2_cache_put() X-Git-Tag: v4.2.1~112 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9854de0d815b0c38a16201e9e11ec61ef84fcf9;p=thirdparty%2Fqemu.git qcow2: update_refcount(): Reset old_table_index after qcow2_cache_put() In the case that update_refcount() frees a refcount block, it evicts it from the metadata cache. Before doing so, however, it returns the currently used refcount block to the cache because it might be the same. Returning the refcount block early means that we need to reset old_table_index so that we reload the refcount block in the next iteration if it is actually still in use. Fixes: f71c08ea8e60f035485a512fd2af8908567592f0 Signed-off-by: Kevin Wolf Message-Id: <20200211094900.17315-2-kwolf@redhat.com> Signed-off-by: Kevin Wolf (cherry picked from commit dea9052ef1ba12c83f17d394c70d7d710ea1dec9) Signed-off-by: Michael Roth --- diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index f67ac6b2d89..b06a9fa9ce4 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -889,6 +889,7 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, offset); if (table != NULL) { qcow2_cache_put(s->refcount_block_cache, &refcount_block); + old_table_index = -1; qcow2_cache_discard(s->refcount_block_cache, table); }