[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/20] parallels: Truncate images on the last used cluster
From: |
Alexander Ivanov |
Subject: |
[PATCH v2 15/20] parallels: Truncate images on the last used cluster |
Date: |
Thu, 19 Oct 2023 14:58:49 +0200 |
On an image closing there can be unused clusters in the end of the image.
Truncate these clusters and update data_end field.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 2d54459087..c7db2a9562 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1458,6 +1458,23 @@ fail:
return ret;
}
+static int parallels_truncate_unused_clusters(BlockDriverState *bs)
+{
+ BDRVParallelsState *s = bs->opaque;
+ uint64_t end_off = 0;
+ if (s->used_bmap_size > 0) {
+ end_off = find_last_bit(s->used_bmap, s->used_bmap_size);
+ if (end_off == s->used_bmap_size) {
+ end_off = 0;
+ } else {
+ end_off = (end_off + 1) * s->cluster_size;
+ }
+ }
+ end_off += s->data_start * BDRV_SECTOR_SIZE;
+ s->data_end = end_off / BDRV_SECTOR_SIZE;
+ return bdrv_truncate(bs->file, end_off, true, PREALLOC_MODE_OFF, 0, NULL);
+}
+
static int parallels_inactivate(BlockDriverState *bs)
{
BDRVParallelsState *s = bs->opaque;
@@ -1475,8 +1492,7 @@ static int parallels_inactivate(BlockDriverState *bs)
parallels_update_header(bs);
/* errors are ignored, so we might as well pass exact=true */
- ret = bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS,
- true, PREALLOC_MODE_OFF, 0, NULL);
+ ret = parallels_truncate_unused_clusters(bs);
if (ret < 0) {
error_report("Failed to truncate image: %s", strerror(-ret));
}
--
2.34.1
- [PATCH v2 10/20] parallels: Add dirty bitmaps saving, (continued)
- [PATCH v2 10/20] parallels: Add dirty bitmaps saving, Alexander Ivanov, 2023/10/19
- [PATCH v2 12/20] parallels: Handle L1 entries equal to one, Alexander Ivanov, 2023/10/19
- [PATCH v2 13/20] parallels: Make a loaded dirty bitmap persistent, Alexander Ivanov, 2023/10/19
- [PATCH v2 14/20] parallels: Reverse a conditional in parallels_check_leak() to reduce indents, Alexander Ivanov, 2023/10/19
- [PATCH v2 11/20] parallels: Let image extensions work in RW mode, Alexander Ivanov, 2023/10/19
- [PATCH v2 16/20] parallels: Check unused clusters in parallels_check_leak(), Alexander Ivanov, 2023/10/19
- [PATCH v2 17/20] parallels: Remove unnecessary data_end field, Alexander Ivanov, 2023/10/19
- [PATCH v2 18/20] tests: Add parallels images support to test 165, Alexander Ivanov, 2023/10/19
- [PATCH v2 19/20] tests: Turned on 256, 299, 304 and block-status-cache for parallels format, Alexander Ivanov, 2023/10/19
- [PATCH v2 15/20] parallels: Truncate images on the last used cluster,
Alexander Ivanov <=
- [PATCH v2 20/20] tests: Add parallels format support to image-fleecing, Alexander Ivanov, 2023/10/19