[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/21] block/copy-before-write: cbw_init(): rename variables
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 14/21] block/copy-before-write: cbw_init(): rename variables |
Date: |
Mon, 17 May 2021 09:44:21 +0300 |
One more step closer to real .bdrv_open() handler: use more usual names
for bs being initialized and its state.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/copy-before-write.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 94b1357fd8..78dc421db2 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -144,40 +144,39 @@ static void cbw_child_perm(BlockDriverState *bs,
BdrvChild *c,
}
}
-static int cbw_init(BlockDriverState *top, BlockDriverState *source,
+static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
BlockDriverState *target, bool compress, Error **errp)
{
- BDRVCopyBeforeWriteState *state = top->opaque;
+ BDRVCopyBeforeWriteState *s = bs->opaque;
- top->total_sectors = source->total_sectors;
- top->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
+ bs->total_sectors = source->total_sectors;
+ bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
(BDRV_REQ_FUA & source->supported_write_flags);
- top->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
+ bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
source->supported_zero_flags);
bdrv_ref(target);
- state->target = bdrv_attach_child(top, target, "target", &child_of_bds,
- BDRV_CHILD_DATA, errp);
- if (!state->target) {
+ s->target = bdrv_attach_child(bs, target, "target", &child_of_bds,
+ BDRV_CHILD_DATA, errp);
+ if (!s->target) {
error_prepend(errp, "Cannot attach target child: ");
bdrv_unref(target);
return -EINVAL;
}
bdrv_ref(source);
- top->file = bdrv_attach_child(top, source, "file", &child_of_bds,
- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
- errp);
- if (!top->file) {
+ bs->file = bdrv_attach_child(bs, source, "file", &child_of_bds,
+ BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
+ errp);
+ if (!bs->file) {
error_prepend(errp, "Cannot attach file child: ");
bdrv_unref(source);
return -EINVAL;
}
- state->bcs = block_copy_state_new(top->file, state->target, false,
compress,
- errp);
- if (!state->bcs) {
+ s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp);
+ if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL;
}
--
2.29.2
- [PATCH 07/21] block-copy: always set BDRV_REQ_SERIALISING flag, (continued)
- [PATCH 07/21] block-copy: always set BDRV_REQ_SERIALISING flag, Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 18/21] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 13/21] block/copy-before-write: introduce cbw_init(), Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 08/21] block/backup: stricter backup_calculate_cluster_size(), Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 14/21] block/copy-before-write: cbw_init(): rename variables,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 17/21] block/block-copy: switch to fully set bitmap by default, Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 09/21] block/backup: move cluster size calculation to block-copy, Vladimir Sementsov-Ogievskiy, 2021/05/17
- [PATCH 16/21] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/05/17