Revert "lvconvert: enable previous syntax to swap metadata"

This reverts commit 717363bb9427c02addeb22ef77396132cb30c782.

These alternate forms for swapping metadata cannot be
distinguished from the command for creating a pool.
If we were to add these alternate forms for swapping
metadata, we would need to overload the pool creation
command defs, making those definitions ambiguous.

diff --git a/tools/command-lines.in b/tools/command-lines.in
index b6aa1d1f6924581768fc823d5bfdeeb208453360..377e5369a47f254a6483dd715a2301e773d23e77 100644 (file)
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -508,20 +508,6 @@ 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 38976029d077d7c0bd036b17f9c1aceb7a692352..502d614e786798e477cd3e9d91c9334cc5fa5ba9 100644 (file)
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4040,6 +4040,7 @@ 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;
@@ -4071,6 +4072,7 @@ 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 65f80c8009dfbfe436b4d35f4e33f9fab45f28de..02aaff286a068e20c7182e903d7d0cb54774c125 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -141,8 +141,6 @@ 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 2f2a0fd7cba9caf1132a03dcbee802fed770bf85..b3858a080786a6f506f7ae861e25dce42c282b8b 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -278,7 +278,6 @@ 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);