[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v7 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg |
Date: |
Wed, 4 Aug 2021 12:37:57 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/copy-before-write.h | 1 -
block/backup.c | 2 +-
block/copy-before-write.c | 7 +++----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/block/copy-before-write.h b/block/copy-before-write.h
index b386fd8f01..51847e711a 100644
--- a/block/copy-before-write.h
+++ b/block/copy-before-write.h
@@ -32,7 +32,6 @@
BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
BlockDriverState *target,
const char *filter_node_name,
- bool compress,
BlockCopyState **bcs,
Error **errp);
void bdrv_cbw_drop(BlockDriverState *bs);
diff --git a/block/backup.c b/block/backup.c
index 83516297cb..4869f1e5da 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -452,7 +452,7 @@ BlockJob *backup_job_create(const char *job_id,
BlockDriverState *bs,
goto error;
}
- cbw = bdrv_cbw_append(bs, target, filter_node_name, false, &bcs, errp);
+ cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp);
if (!cbw) {
goto error;
}
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 4858dcf8ff..1e7180760a 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -145,7 +145,7 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild
*c,
}
static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
- BlockDriverState *target, bool compress, Error **errp)
+ BlockDriverState *target, Error **errp)
{
BDRVCopyBeforeWriteState *s = bs->opaque;
@@ -173,7 +173,7 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState
*source,
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
bs->file->bs->supported_zero_flags);
- s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp);
+ s->bcs = block_copy_state_new(bs->file, s->target, false, false, errp);
if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL;
@@ -202,7 +202,6 @@ BlockDriver bdrv_cbw_filter = {
BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
BlockDriverState *target,
const char *filter_node_name,
- bool compress,
BlockCopyState **bcs,
Error **errp)
{
@@ -221,7 +220,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
}
state = top->opaque;
- ret = cbw_init(top, source, target, compress, errp);
+ ret = cbw_init(top, source, target, errp);
if (ret < 0) {
goto fail;
}
--
2.29.2
- [PATCH v7 08/33] block/backup: set copy_range and compress after filter insertion, (continued)
- [PATCH v7 08/33] block/backup: set copy_range and compress after filter insertion, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 11/33] block/copy-before-write: drop extra bdrv_unref on failure path, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 12/33] block/copy-before-write: use file child instead of backing, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 04/33] qdev: allow setting drive property for realized device, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 15/33] block/copy-before-write: cbw_init(): rename variables, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 09/33] block/backup: move cluster size calculation to block-copy, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 13/33] block/copy-before-write: bdrv_cbw_append(): replace child at last, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 16/33] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 14/33] block/copy-before-write: introduce cbw_init(), Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v7 20/33] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 18/33] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 21/33] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 19/33] block/copy-before-write: initialize block-copy bitmap, Vladimir Sementsov-Ogievskiy, 2021/08/04
- [PATCH v7 22/33] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/08/04