|
 |
05bba0 |
From aa1df6fcd4c2dbfd39cac3e1d68208cca61643ce Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
Date: Sat, 13 Jun 2015 16:22:23 +0200
|
|
|
05bba0 |
Subject: [PATCH 29/42] qcow2: Clean up after refcount rebuild
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <1434212556-3927-30-git-send-email-mreitz@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 66048
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 29/42] qcow2: Clean up after refcount rebuild
|
|
|
05bba0 |
Bugzilla: 1129893
|
|
|
05bba0 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
BZ: 1129893
|
|
|
05bba0 |
|
|
|
05bba0 |
Because the old refcount structure will be leaked after having rebuilt
|
|
|
05bba0 |
it, we need to recalculate the refcounts and run a leak-fixing operation
|
|
|
05bba0 |
afterwards (if leaks should be fixed at all).
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
05bba0 |
(cherry picked from commit 791230d8bbd5c09d80845755a54074cd2d8b5a22)
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
---
|
|
|
05bba0 |
block/qcow2-refcount.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
|
05bba0 |
1 file changed, 45 insertions(+)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
|
05bba0 |
index 651ddb6..fe36bbd 100644
|
|
|
05bba0 |
--- a/block/qcow2-refcount.c
|
|
|
05bba0 |
+++ b/block/qcow2-refcount.c
|
|
|
05bba0 |
@@ -1983,12 +1983,57 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
|
|
05bba0 |
nb_clusters);
|
|
|
05bba0 |
|
|
|
05bba0 |
if (rebuild && (fix & BDRV_FIX_ERRORS)) {
|
|
|
05bba0 |
+ BdrvCheckResult old_res = *res;
|
|
|
05bba0 |
+ int fresh_leaks = 0;
|
|
|
05bba0 |
+
|
|
|
05bba0 |
fprintf(stderr, "Rebuilding refcount structure\n");
|
|
|
05bba0 |
ret = rebuild_refcount_structure(bs, res, &refcount_table,
|
|
|
05bba0 |
&nb_clusters);
|
|
|
05bba0 |
if (ret < 0) {
|
|
|
05bba0 |
goto fail;
|
|
|
05bba0 |
}
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ res->corruptions = 0;
|
|
|
05bba0 |
+ res->leaks = 0;
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ /* Because the old reftable has been exchanged for a new one the
|
|
|
05bba0 |
+ * references have to be recalculated */
|
|
|
05bba0 |
+ rebuild = false;
|
|
|
05bba0 |
+ memset(refcount_table, 0, nb_clusters * sizeof(uint16_t));
|
|
|
05bba0 |
+ ret = calculate_refcounts(bs, res, 0, &rebuild, &refcount_table,
|
|
|
05bba0 |
+ &nb_clusters);
|
|
|
05bba0 |
+ if (ret < 0) {
|
|
|
05bba0 |
+ goto fail;
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ if (fix & BDRV_FIX_LEAKS) {
|
|
|
05bba0 |
+ /* The old refcount structures are now leaked, fix it; the result
|
|
|
05bba0 |
+ * can be ignored, aside from leaks which were introduced by
|
|
|
05bba0 |
+ * rebuild_refcount_structure() that could not be fixed */
|
|
|
05bba0 |
+ BdrvCheckResult saved_res = *res;
|
|
|
05bba0 |
+ *res = (BdrvCheckResult){ 0 };
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ compare_refcounts(bs, res, BDRV_FIX_LEAKS, &rebuild,
|
|
|
05bba0 |
+ &highest_cluster, refcount_table, nb_clusters);
|
|
|
05bba0 |
+ if (rebuild) {
|
|
|
05bba0 |
+ fprintf(stderr, "ERROR rebuilt refcount structure is still "
|
|
|
05bba0 |
+ "broken\n");
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ /* Any leaks accounted for here were introduced by
|
|
|
05bba0 |
+ * rebuild_refcount_structure() because that function has created a
|
|
|
05bba0 |
+ * new refcount structure from scratch */
|
|
|
05bba0 |
+ fresh_leaks = res->leaks;
|
|
|
05bba0 |
+ *res = saved_res;
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
+
|
|
|
05bba0 |
+ if (res->corruptions < old_res.corruptions) {
|
|
|
05bba0 |
+ res->corruptions_fixed += old_res.corruptions - res->corruptions;
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
+ if (res->leaks < old_res.leaks) {
|
|
|
05bba0 |
+ res->leaks_fixed += old_res.leaks - res->leaks;
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
+ res->leaks += fresh_leaks;
|
|
|
05bba0 |
} else if (fix) {
|
|
|
05bba0 |
if (rebuild) {
|
|
|
05bba0 |
fprintf(stderr, "ERROR need to rebuild refcount structures\n");
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|