[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 02/21] parallels: Move inactivation code to a separate functio
From: |
Alexander Ivanov |
Subject: |
[PATCH v4 02/21] parallels: Move inactivation code to a separate function |
Date: |
Thu, 28 Dec 2023 11:12:13 +0100 |
We are going to add parallels image extensions storage and need a separate
function for inactivation code.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 072b1efd78..992362ce29 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1424,6 +1424,20 @@ fail:
return ret;
}
+static int GRAPH_RDLOCK parallels_inactivate(BlockDriverState *bs)
+{
+ BDRVParallelsState *s = bs->opaque;
+ int ret;
+
+ s->header->inuse = 0;
+ 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);
+
+ return ret;
+}
static void parallels_close(BlockDriverState *bs)
{
@@ -1432,12 +1446,7 @@ static void parallels_close(BlockDriverState *bs)
GRAPH_RDLOCK_GUARD_MAINLOOP();
if ((bs->open_flags & BDRV_O_RDWR) && !(bs->open_flags & BDRV_O_INACTIVE))
{
- s->header->inuse = 0;
- parallels_update_header(bs);
-
- /* errors are ignored, so we might as well pass exact=true */
- bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, true,
- PREALLOC_MODE_OFF, 0, NULL);
+ parallels_inactivate(bs);
}
parallels_free_used_bitmap(bs);
@@ -1476,6 +1485,7 @@ static BlockDriver bdrv_parallels = {
.bdrv_co_check = parallels_co_check,
.bdrv_co_pdiscard = parallels_co_pdiscard,
.bdrv_co_pwrite_zeroes = parallels_co_pwrite_zeroes,
+ .bdrv_inactivate = parallels_inactivate,
};
static void bdrv_parallels_init(void)
--
2.40.1
- [PATCH v4 00/21] parallels: Add full dirty bitmap support, Alexander Ivanov, 2023/12/28
- [PATCH v4 01/21] parallels: Set s->used_bmap to NULL in parallels_free_used_bitmap(), Alexander Ivanov, 2023/12/28
- [PATCH v4 02/21] parallels: Move inactivation code to a separate function,
Alexander Ivanov <=
- [PATCH v4 03/21] parallels: Make mark_used() a global function, Alexander Ivanov, 2023/12/28
- [PATCH v4 04/21] parallels: Limit search in parallels_mark_used to the last marked claster, Alexander Ivanov, 2023/12/28
- [PATCH v4 14/21] parallels: Make a loaded dirty bitmap persistent, Alexander Ivanov, 2023/12/28
- [PATCH v4 05/21] parallels: Add parallels_mark_unused() helper, Alexander Ivanov, 2023/12/28
- [PATCH v4 16/21] parallels: Truncate images on the last used cluster, Alexander Ivanov, 2023/12/28
- [PATCH v4 17/21] parallels: Check unused clusters in parallels_check_leak(), Alexander Ivanov, 2023/12/28
- [PATCH v4 06/21] parallels: Move host clusters allocation to a separate function, Alexander Ivanov, 2023/12/28
- [PATCH v4 08/21] parallels: Recreate used bitmap in parallels_check_leak(), Alexander Ivanov, 2023/12/28
- [PATCH v4 10/21] parallels: Create used bitmap even if checks needed, Alexander Ivanov, 2023/12/28
- [PATCH v4 09/21] parallels: Add a note about used bitmap in parallels_check_duplicate(), Alexander Ivanov, 2023/12/28