[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/21] parallels: Make mark_used() a global function
From: |
Alexander Ivanov |
Subject: |
[PATCH 03/21] parallels: Make mark_used() a global function |
Date: |
Thu, 28 Dec 2023 10:41:35 +0100 |
We will need this function and a function for marking unused clusters (will
be added in the next patch) in parallels-ext.c too. Let it be a global
function parallels_mark_used().
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 14 ++++++++------
block/parallels.h | 3 +++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 992362ce29..ae524f1820 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -178,8 +178,8 @@ static void parallels_set_bat_entry(BDRVParallelsState *s,
bitmap_set(s->bat_dirty_bmap, bat_entry_off(index) / s->bat_dirty_block,
1);
}
-static int mark_used(BlockDriverState *bs, unsigned long *bitmap,
- uint32_t bitmap_size, int64_t off, uint32_t count)
+int parallels_mark_used(BlockDriverState *bs, unsigned long *bitmap,
+ uint32_t bitmap_size, int64_t off, uint32_t count)
{
BDRVParallelsState *s = bs->opaque;
uint32_t cluster_index = host_cluster_index(s, off);
@@ -232,7 +232,8 @@ static int GRAPH_RDLOCK
parallels_fill_used_bitmap(BlockDriverState *bs)
continue;
}
- err2 = mark_used(bs, s->used_bmap, s->used_bmap_size, host_off, 1);
+ err2 = parallels_mark_used(bs, s->used_bmap, s->used_bmap_size,
+ host_off, 1);
if (err2 < 0 && err == 0) {
err = err2;
}
@@ -366,7 +367,8 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_num,
}
}
- ret = mark_used(bs, s->used_bmap, s->used_bmap_size, host_off,
to_allocate);
+ ret = parallels_mark_used(bs, s->used_bmap, s->used_bmap_size,
+ host_off, to_allocate);
if (ret < 0) {
/* Image consistency is broken. Alarm! */
return ret;
@@ -827,7 +829,7 @@ parallels_check_duplicate(BlockDriverState *bs,
BdrvCheckResult *res,
continue;
}
- ret = mark_used(bs, bitmap, bitmap_size, host_off, 1);
+ ret = parallels_mark_used(bs, bitmap, bitmap_size, host_off, 1);
assert(ret != -E2BIG);
if (ret == 0) {
continue;
@@ -887,7 +889,7 @@ parallels_check_duplicate(BlockDriverState *bs,
BdrvCheckResult *res,
* considered, and the bitmap size doesn't change. This specifically
* means that -E2BIG is OK.
*/
- ret = mark_used(bs, bitmap, bitmap_size, host_off, 1);
+ ret = parallels_mark_used(bs, bitmap, bitmap_size, host_off, 1);
if (ret == -EBUSY) {
res->check_errors++;
goto out_repair_bat;
diff --git a/block/parallels.h b/block/parallels.h
index 423b2ad727..68077416b1 100644
--- a/block/parallels.h
+++ b/block/parallels.h
@@ -90,6 +90,9 @@ typedef struct BDRVParallelsState {
Error *migration_blocker;
} BDRVParallelsState;
+int parallels_mark_used(BlockDriverState *bs, unsigned long *bitmap,
+ uint32_t bitmap_size, int64_t off, uint32_t count);
+
int GRAPH_RDLOCK
parallels_read_format_extension(BlockDriverState *bs, int64_t ext_off,
Error **errp);
--
2.40.1
- [PATCH 13/21] parallels: Handle L1 entries equal to one, (continued)
- [PATCH 13/21] parallels: Handle L1 entries equal to one, Alexander Ivanov, 2023/12/28
- [PATCH 17/21] parallels: Check unused clusters in parallels_check_leak(), Alexander Ivanov, 2023/12/28
- [PATCH 20/21] tests: Turned on 256, 299, 304 and block-status-cache for parallels format, Alexander Ivanov, 2023/12/28
- [PATCH 21/21] tests: Add parallels format support to image-fleecing, Alexander Ivanov, 2023/12/28
- [PATCH 09/21] parallels: Add a note about used bitmap in parallels_check_duplicate(), Alexander Ivanov, 2023/12/28
- [PATCH 15/21] parallels: Reverse a conditional in parallels_check_leak() to reduce indents, Alexander Ivanov, 2023/12/28
- [PATCH 14/21] parallels: Make a loaded dirty bitmap persistent, Alexander Ivanov, 2023/12/28
- [PATCH 18/21] parallels: Remove unnecessary data_end field, Alexander Ivanov, 2023/12/28
- [PATCH 19/21] tests: Add parallels images support to test 165, Alexander Ivanov, 2023/12/28
- [PATCH 16/21] parallels: Truncate images on the last used cluster, Alexander Ivanov, 2023/12/28
- [PATCH 03/21] parallels: Make mark_used() a global function,
Alexander Ivanov <=
- Re: [PATCH 01/21] parallels: Set s->used_bmap to NULL in parallels_free_used_bitmap(), Alexander Ivanov, 2023/12/28