[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 3/5] parallels: Add change_info argument to parallels_check_le
From: |
Alexander Ivanov |
Subject: |
[PATCH v6 3/5] parallels: Add change_info argument to parallels_check_leak() |
Date: |
Wed, 21 Jun 2023 10:20:08 +0200 |
In the next patch we need to repair leaks without changing leaks and
leaks_fixed info in res. Add change_info argument to skip info changing
if the argument is false.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 4b7eafba1e..78a34bd667 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -484,7 +484,7 @@ parallels_check_outside_image(BlockDriverState *bs,
BdrvCheckResult *res,
static int coroutine_fn GRAPH_RDLOCK
parallels_check_leak(BlockDriverState *bs, BdrvCheckResult *res,
- BdrvCheckMode fix)
+ BdrvCheckMode fix, bool change_info)
{
BDRVParallelsState *s = bs->opaque;
int64_t size;
@@ -502,7 +502,9 @@ parallels_check_leak(BlockDriverState *bs, BdrvCheckResult
*res,
fprintf(stderr, "%s space leaked at the end of the image %" PRId64
"\n",
fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR",
size - res->image_end_offset);
- res->leaks += count;
+ if (change_info) {
+ res->leaks += count;
+ }
if (fix & BDRV_FIX_LEAKS) {
Error *local_err = NULL;
@@ -517,7 +519,9 @@ parallels_check_leak(BlockDriverState *bs, BdrvCheckResult
*res,
res->check_errors++;
return ret;
}
- res->leaks_fixed += count;
+ if (change_info) {
+ res->leaks_fixed += count;
+ }
}
}
@@ -570,7 +574,7 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult
*res,
return ret;
}
- ret = parallels_check_leak(bs, res, fix);
+ ret = parallels_check_leak(bs, res, fix, true);
if (ret < 0) {
return ret;
}
--
2.34.1
- [PATCH v6 0/5] parallels: Add duplication check, repair at open, fix bugs, Alexander Ivanov, 2023/06/21
- [PATCH v6 1/5] parallels: Incorrect data end calculation in parallels_open(), Alexander Ivanov, 2023/06/21
- [PATCH v6 2/5] parallels: Check if data_end greater than the file size, Alexander Ivanov, 2023/06/21
- [PATCH v6 3/5] parallels: Add change_info argument to parallels_check_leak(),
Alexander Ivanov <=
- [PATCH v6 4/5] parallels: Add checking and repairing duplicate offsets in BAT, Alexander Ivanov, 2023/06/21
- [PATCH v6 5/5] parallels: Image repairing in parallels_open(), Alexander Ivanov, 2023/06/21
- Re: [PATCH v6 0/5] parallels: Add duplication check, repair at open, fix bugs, Denis V. Lunev, 2023/06/21