|
 |
4aaf76 |
tools/lvconvert.c | 12 ++++++------
|
|
|
4aaf76 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
4aaf76 |
|
|
|
4aaf76 |
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
|
|
|
4aaf76 |
index 6066d1f..8488596 100644
|
|
|
4aaf76 |
--- a/tools/lvconvert.c
|
|
|
4aaf76 |
+++ b/tools/lvconvert.c
|
|
|
4aaf76 |
@@ -5438,7 +5438,7 @@ static int _lvconvert_to_vdopool_single(struct cmd_context *cmd,
|
|
|
4aaf76 |
struct processing_handle *handle)
|
|
|
4aaf76 |
{
|
|
|
4aaf76 |
const char *vg_name = NULL;
|
|
|
4aaf76 |
- unsigned int zero_vdopool;
|
|
|
4aaf76 |
+ unsigned int vdo_pool_zero;
|
|
|
4aaf76 |
struct volume_group *vg = lv->vg;
|
|
|
4aaf76 |
struct logical_volume *vdo_lv;
|
|
|
4aaf76 |
struct dm_vdo_target_params vdo_params; /* vdo */
|
|
|
4aaf76 |
@@ -5497,12 +5497,12 @@ static int _lvconvert_to_vdopool_single(struct cmd_context *cmd,
|
|
|
4aaf76 |
goto out;
|
|
|
4aaf76 |
}
|
|
|
4aaf76 |
|
|
|
4aaf76 |
- zero_vdopool = arg_int_value(cmd, zero_ARG, 1);
|
|
|
4aaf76 |
+ vdo_pool_zero = arg_int_value(cmd, zero_ARG, 1);
|
|
|
4aaf76 |
|
|
|
4aaf76 |
log_warn("WARNING: Converting logical volume %s to VDO pool volume %s formating.",
|
|
|
4aaf76 |
- display_lvname(lv), zero_vdopool ? "with" : "WITHOUT");
|
|
|
4aaf76 |
+ display_lvname(lv), vdo_pool_zero ? "with" : "WITHOUT");
|
|
|
4aaf76 |
|
|
|
4aaf76 |
- if (zero_vdopool)
|
|
|
4aaf76 |
+ if (vdo_pool_zero)
|
|
|
4aaf76 |
log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
|
|
|
4aaf76 |
else
|
|
|
4aaf76 |
log_warn("WARNING: Using invalid VDO pool data MAY DESTROY YOUR DATA!");
|
|
|
4aaf76 |
@@ -5514,7 +5514,7 @@ static int _lvconvert_to_vdopool_single(struct cmd_context *cmd,
|
|
|
4aaf76 |
goto out;
|
|
|
4aaf76 |
}
|
|
|
4aaf76 |
|
|
|
4aaf76 |
- if (zero_vdopool) {
|
|
|
4aaf76 |
+ if (vdo_pool_zero) {
|
|
|
4aaf76 |
if (!wipe_lv(lv, (struct wipe_params) { .do_zero = 1, .do_wipe_signatures = 1,
|
|
|
4aaf76 |
.yes = arg_count(cmd, yes_ARG),
|
|
|
4aaf76 |
.force = arg_count(cmd, force_ARG)})) {
|
|
|
4aaf76 |
@@ -5526,7 +5526,7 @@ static int _lvconvert_to_vdopool_single(struct cmd_context *cmd,
|
|
|
4aaf76 |
if (!archive(vg))
|
|
|
4aaf76 |
goto_out;
|
|
|
4aaf76 |
|
|
|
4aaf76 |
- if (!convert_vdo_pool_lv(lv, &vdo_params, &lvc.virtual_extents, zero_vdopool))
|
|
|
4aaf76 |
+ if (!convert_vdo_pool_lv(lv, &vdo_params, &lvc.virtual_extents, vdo_pool_zero))
|
|
|
4aaf76 |
goto_out;
|
|
|
4aaf76 |
|
|
|
4aaf76 |
dm_list_init(&lvc.tags);
|