[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] qcow2: Clean up after refcount rebuild
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 6/8] qcow2: Clean up after refcount rebuild |
Date: |
Wed, 13 Aug 2014 23:01:48 +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.
Signed-off-by: Max Reitz <address@hidden>
---
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
- [Qemu-devel] [PATCH 2/8] qcow2: Factor out refcount comparison for check, (continued)
- [Qemu-devel] [PATCH 3/8] qcow2: Fix refcount blocks beyond image end, Max Reitz, 2014/08/13
- [Qemu-devel] [PATCH 4/8] qcow2: Do not perform potentially damaging repairs, Max Reitz, 2014/08/13
- [Qemu-devel] [PATCH 6/8] qcow2: Clean up after refcount rebuild,
Max Reitz <=
- [Qemu-devel] [PATCH 5/8] qcow2: Rebuild refcount structure during check, Max Reitz, 2014/08/13
- [Qemu-devel] [PATCH 7/8] iotests: Fix test outputs, Max Reitz, 2014/08/13
- [Qemu-devel] [PATCH 8/8] iotests: Add test for potentially damaging repairs, Max Reitz, 2014/08/13