From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHfgZ-00077f-Ld for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHfgT-0005Qt-C3 for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHfgT-0005Qm-3q for qemu-devel@nongnu.org; Wed, 13 Aug 2014 17:02:13 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7DL2C6X021793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Aug 2014 17:02:12 -0400 From: Max Reitz Date: Wed, 13 Aug 2014 23:01:48 +0200 Message-Id: <1407963710-4942-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1407963710-4942-1-git-send-email-mreitz@redhat.com> References: <1407963710-4942-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 6/8] 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 , 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. Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index e3ca03a..1518f06 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1870,12 +1870,45 @@ 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; + } + + /* 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