From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIJFV-0003TZ-Sd for qemu-devel@nongnu.org; Fri, 15 Aug 2014 11:17:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIJFP-00069p-NV for qemu-devel@nongnu.org; Fri, 15 Aug 2014 11:17:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIJFP-00069k-EG for qemu-devel@nongnu.org; Fri, 15 Aug 2014 11:16:55 -0400 From: Max Reitz Date: Fri, 15 Aug 2014 17:16:24 +0200 Message-Id: <1408115786-13640-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1408115786-13640-1-git-send-email-mreitz@redhat.com> References: <1408115786-13640-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 7/9] qcow2: Clean up after refcount rebuild List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz Because the old refcount structure will be leaked after having rebuilt it, we need to recalculate the refcounts and run a leak-fixing operation afterwards (if leaks should be fixed at all). Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index a442b8d..cc2a304 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1874,12 +1874,47 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, nb_clusters); if (rebuild && (fix & BDRV_FIX_ERRORS)) { + BdrvCheckResult old_res = *res; + fprintf(stderr, "Rebuilding refcount structure\n"); ret = rebuild_refcount_structure(bs, res, &refcount_table, &nb_clusters); if (ret < 0) { goto fail; } + + res->corruptions = 0; + res->leaks = 0; + + /* Because the old reftable has been exchanged for a new one the + * references have to be recalculated */ + rebuild = false; + memset(refcount_table, 0, nb_clusters * sizeof(uint16_t)); + ret = calculate_refcounts(bs, res, 0, &rebuild, &refcount_table, + &nb_clusters); + if (ret < 0) { + goto fail; + } + + if (fix & BDRV_FIX_LEAKS) { + /* The old refcount structures are now leaked, fix it; the result + * can be ignored */ + pre_compare_res = *res; + compare_refcounts(bs, res, BDRV_FIX_LEAKS, &rebuild, + &highest_cluster, refcount_table, nb_clusters); + if (rebuild) { + fprintf(stderr, "ERROR rebuilt refcount structure is still " + "broken\n"); + } + *res = pre_compare_res; + } + + if (res->corruptions < old_res.corruptions) { + res->corruptions_fixed += old_res.corruptions - res->corruptions; + } + if (res->leaks < old_res.leaks) { + res->leaks_fixed += old_res.leaks - res->leaks; + } } else if (fix) { if (rebuild) { fprintf(stderr, "ERROR need to rebuild refcount structures\n"); -- 2.0.3