lvconvert: enable previous syntax to swap metadata

diff --git a/tools/command-lines.in b/tools/command-lines.in
index 1a9a796bf0e953319377f87df93befcdc2acf0f8..2eddd41748da16e5504a7e4667c2041d240b8921 100644 (file)
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -508,6 +508,20 @@ OO: --chunksize SizeKB, OO_LVCONVERT
 ID: lvconvert_swap_pool_metadata
 DESC: Swap metadata LV in a thin pool or cache pool (for repair only).
 
+lvconvert --poolmetadata LV --thinpool LV_thinpool
+OO: --chunksize SizeKB, OO_LVCONVERT
+ID: lvconvert_swap_thinpool_metadata
+DESC: Swap metadata LV in a thin pool (for repair only).
+DESC: (variant, use --swapmetadata).
+FLAGS: SECONDARY_SYNTAX
+
+lvconvert --poolmetadata LV --cachepool LV_cachepool
+OO: --chunksize SizeKB, OO_LVCONVERT
+ID: lvconvert_swap_cachepool_metadata
+DESC: Swap metadata LV in a cache pool (for repair only).
+DESC: (variant, use --swapmetadata).
+FLAGS: SECONDARY_SYNTAX
+
 ---
 
 # lvconvert --merge is an extremely ambiguous command.

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 502d614e786798e477cd3e9d91c9334cc5fa5ba9..38976029d077d7c0bd036b17f9c1aceb7a692352 100644 (file)
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4040,7 +4040,6 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
                               NULL, NULL, &_lvconvert_swap_pool_metadata_single);
 }
 
-#if 0
 int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
 {
        struct command *new_command;
@@ -4072,7 +4071,6 @@ int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, ch
 
        return lvconvert_swap_pool_metadata_cmd(cmd, argc, argv);
 }
-#endif
 
 static int _lvconvert_merge_thin_single(struct cmd_context *cmd,
                                         struct logical_volume *lv,

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 44efc85ba4c3151e3687a2f3d8b5c35187170d46..40e1cf40f3141f50291a73ebf128f890c9914241 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -141,6 +141,8 @@ struct command_function command_functions[CMD_COUNT] = {
        { lvconvert_to_thin_with_external_CMD,          lvconvert_to_thin_with_external_cmd },
        { lvconvert_to_cache_vol_CMD,                   lvconvert_to_cache_vol_cmd },
        { lvconvert_swap_pool_metadata_CMD,             lvconvert_swap_pool_metadata_cmd },
+       { lvconvert_swap_thinpool_metadata_CMD,         lvconvert_swap_pool_metadata_noarg_cmd },
+       { lvconvert_swap_cachepool_metadata_CMD,        lvconvert_swap_pool_metadata_noarg_cmd },
        { lvconvert_merge_thin_CMD,                     lvconvert_merge_thin_cmd },
        { lvconvert_split_and_keep_cachepool_CMD,       lvconvert_split_cachepool_cmd },
        { lvconvert_split_and_remove_cachepool_CMD,     lvconvert_split_cachepool_cmd },

diff --git a/tools/tools.h b/tools/tools.h
index b3858a080786a6f506f7ae861e25dce42c282b8b..2f2a0fd7cba9caf1132a03dcbee802fed770bf85 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -278,6 +278,7 @@ int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);