[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/11] block/block-copy: move copy_bitmap initialization to block
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 01/11] block/block-copy: move copy_bitmap initialization to block_copy_state_new() |
Date: |
Wed, 4 Aug 2021 16:17:40 +0300 |
We are going to complicate bitmap initialization in the following
commit. And in future, backup job will be able to work without filter
(when source is immutable), so we'll need same bitmap initialization in
copy-before-write filter and in backup job. So, it's reasonable to do
it in block-copy.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/block-copy.c | 1 +
block/copy-before-write.c | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index 90664ee0ab..307045a59f 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -418,6 +418,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,
BdrvChild *target,
return NULL;
}
bdrv_disable_dirty_bitmap(copy_bitmap);
+ bdrv_set_dirty_bitmap(copy_bitmap, 0, bdrv_dirty_bitmap_size(copy_bitmap));
s = g_new(BlockCopyState, 1);
*s = (BlockCopyState) {
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 2cd68b480a..b36ede3186 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -148,7 +148,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options,
int flags,
Error **errp)
{
BDRVCopyBeforeWriteState *s = bs->opaque;
- BdrvDirtyBitmap *copy_bitmap;
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
@@ -176,9 +175,6 @@ static int cbw_open(BlockDriverState *bs, QDict *options,
int flags,
return -EINVAL;
}
- copy_bitmap = block_copy_dirty_bitmap(s->bcs);
- bdrv_set_dirty_bitmap(copy_bitmap, 0, bdrv_dirty_bitmap_size(copy_bitmap));
-
return 0;
}
--
2.29.2
- [PATCH RFC DRAFT 00/11] Make image fleecing more usable, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 01/11] block/block-copy: move copy_bitmap initialization to block_copy_state_new(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH 02/11] block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 04/11] block/copy-before-write: add bitmap open parameter, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 03/11] block/block-copy: block_copy_state_new(): add bitmap parameter, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 06/11] block: intoduce reqlist, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 05/11] block/block-copy: add block_copy_reset(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 08/11] block/reqlist: add reqlist_wait_all(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 07/11] block/dirty-bitmap: introduce bdrv_dirty_bitmap_status(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 09/11] block/copy-before-write: add cbw_snapshot_read_{lock, unlock}(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 10/11] block/copy-before-write: add cbw_snapshot_discard(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH 11/11] block: introduce fleecing block driver, Vladimir Sementsov-Ogievskiy, 2021/08/04