[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/21] parallels: Truncate images on the last used cluster
From: |
Alexander Ivanov |
Subject: |
[PATCH v3 16/21] parallels: Truncate images on the last used cluster |
Date: |
Fri, 27 Oct 2023 09:46:31 +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 354fa0f2cc..472311e2e6 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1456,6 +1456,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 GRAPH_RDLOCK parallels_inactivate(BlockDriverState *bs)
{
BDRVParallelsState *s = bs->opaque;
@@ -1473,8 +1490,7 @@ static int GRAPH_RDLOCK
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 v3 21/21] tests: Add parallels format support to image-fleecing, (continued)
- [PATCH v3 21/21] tests: Add parallels format support to image-fleecing, Alexander Ivanov, 2023/10/27
- [PATCH v3 10/21] parallels: Add dirty bitmaps saving, Alexander Ivanov, 2023/10/27
- [PATCH v3 14/21] parallels: Make a loaded dirty bitmap persistent, Alexander Ivanov, 2023/10/27
- [PATCH v3 17/21] parallels: Check unused clusters in parallels_check_leak(), Alexander Ivanov, 2023/10/27
- [PATCH v3 20/21] tests: Turned on 256, 299, 304 and block-status-cache for parallels format, Alexander Ivanov, 2023/10/27
- [PATCH v3 04/21] parallels: Add parallels_mark_unused() helper, Alexander Ivanov, 2023/10/27
- [PATCH v3 15/21] parallels: Reverse a conditional in parallels_check_leak() to reduce indents, Alexander Ivanov, 2023/10/27
- [PATCH v3 08/21] parallels: Add a note about used bitmap in parallels_check_duplicate(), Alexander Ivanov, 2023/10/27
- [PATCH v3 19/21] tests: Add parallels images support to test 165, Alexander Ivanov, 2023/10/27
- [PATCH v3 07/21] parallels: Recreate used bitmap in parallels_check_leak(), Alexander Ivanov, 2023/10/27
- [PATCH v3 16/21] parallels: Truncate images on the last used cluster,
Alexander Ivanov <=
- [PATCH v3 12/21] parallels: Let image extensions work in RW mode, Alexander Ivanov, 2023/10/27
- [PATCH v3 06/21] parallels: Set data_end value in parallels_check_leak(), Alexander Ivanov, 2023/10/27
- [PATCH v3 11/21] parallels: Mark parallels_inactivate GRAPH_RDLOCK, guard parallels_close, Alexander Ivanov, 2023/10/27