[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/10] qcow2: Clean up after refcount rebuild
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 08/10] qcow2: Clean up after refcount rebuild |
Date: |
Wed, 27 Aug 2014 22:18:24 +0200 |
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 <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
---
block/qcow2-refcount.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 2dca6d4..55aa925 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1908,12 +1908,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.1.0
- [Qemu-devel] [PATCH v4 00/10] qcow2: Fix image repairing, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 01/10] qcow2: Fix leaks in dirty images, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 02/10] qcow2: Split qcow2_check_refcounts(), Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 03/10] qcow2: Pull check_refblocks() up, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 04/10] qcow2: Reuse refcount table in calculate_refcounts(), Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 05/10] qcow2: Fix refcount blocks beyond image end, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 06/10] qcow2: Do not perform potentially damaging repairs, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 07/10] qcow2: Rebuild refcount structure during check, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 08/10] qcow2: Clean up after refcount rebuild,
Max Reitz <=
- [Qemu-devel] [PATCH v4 09/10] iotests: Fix test outputs, Max Reitz, 2014/08/27
- [Qemu-devel] [PATCH v4 10/10] iotests: Add test for potentially damaging repairs, Max Reitz, 2014/08/27