diff options
| author | David Teigland <teigland@redhat.com> | 2017-02-13 14:40:53 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2017-02-13 14:41:54 -0600 |
| commit | 717363bb9427c02addeb22ef77396132cb30c782 (patch) | |
| tree | b4728b1f6d522e8a223051f6e407bc12fdb5b05a | |
| parent | b2fd5b31d3cbe1267ab01c4d6af4785f800938f4 (diff) | |
| download | lvm2-717363bb9427c02addeb22ef77396132cb30c782.tar.gz | |
lvconvert: enable previous syntax to swap metadata
| -rw-r--r-- | tools/command-lines.in | 14 | ||||
| -rw-r--r-- | tools/lvconvert.c | 2 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 2 | ||||
| -rw-r--r-- | tools/tools.h | 1 |
4 files changed, 17 insertions, 2 deletions
diff --git a/tools/command-lines.in b/tools/command-lines.in index 1a9a796bf..2eddd4174 100644 --- 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 502d614e7..38976029d 100644 --- 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 44efc85ba..40e1cf40f 100644 --- 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 b3858a080..2f2a0fd7c 100644 --- 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); |