LU-13107 utils: remove duplicate lctl erase/fork_lcfg

A patch merge error resulted in duplicate erase_lcfg and fork_lcfg
sub-commands in lctl.  Remove the duplicates, and move them to the
llog section, since they relate to the configuration llogs.

Fixes: b0efebdaef52 ("LU-13107 utils: clean up lctl command usage")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I4449f7dbb0ab7b643e5057131bbc9620ac457a3d
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/48886
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 260deab..0a13eb5 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -346,12 +346,6 @@ command_t cmdlist[] = {
         "usage: snapshot_umount <-F | --fsname fsname> [-h | --help]\n"
         "                       <-n | --name ssname>\n"
         "                       [-r | --rsh remote_shell]"},
-       {"fork_lcfg", jt_lcfg_fork, 0,
-        "copy configuration files for named filesystem with given name\n"
-        "usage: fork_lcfg <fsname> <newname>"},
-       {"erase_lcfg", jt_lcfg_erase, 0,
-        "permanently erase configuration for the named filesystem\n"
-        "usage: erase_lcfg <fsname>"},
 #endif /* HAVE_SERVER_SUPPORT */
        /* Nodemap commands */
        {"=== Nodemap ===", NULL, 0, "nodemap management"},
@@ -427,15 +421,6 @@ command_t cmdlist[] = {
         "usage: setup <args...>"},
        {"cleanup", jt_obd_cleanup, 0, "cleanup previously setup device\n"
         "usage: cleanup [force | failover]"},
-       {"clear_conf", jt_lcfg_clear, 0,
-        "drop unused config logs for a device or filesystem\n"
-        "usage: clear_conf <device|fsname>"},
-       {"fork_lcfg", jt_lcfg_fork, 0,
-        "copy configuration files for named filesystem with given name\n"
-        "usage: fork_lcfg <fsname> <newname>"},
-       {"erase_lcfg", jt_lcfg_erase, 0,
-        "permanently erase configuration for the named filesystem\n"
-        "usage: erase_lcfg <fsname>"},
 
 #ifdef HAVE_SERVER_SUPPORT
        /* LFSCK commands */
@@ -457,7 +442,6 @@ command_t cmdlist[] = {
         "usage: lfsck_query [--device|-M MDT_device] [--help|-h]\n"
         "                   [--type|-t lfsck_type[,lfsck_type...]]\n"
         "                   [--wait|-w]"},
-#endif /* HAVE_SERVER_SUPPORT */
 
        /* Llog operations */
        {"==== LLOG ====", NULL, 0, "LLOG"},
@@ -483,6 +467,16 @@ command_t cmdlist[] = {
        {"llog_remove", jt_llog_remove, 0,
         "remove one log from catalog or plain log, erase it from disk.\n"
         "usage: llog_remove <logname|FID> [--log_id <id>]"},
+       {"clear_conf", jt_lcfg_clear, 0,
+        "drop unused config logs for a device or filesystem\n"
+        "usage: clear_conf <device|fsname>"},
+       {"fork_lcfg", jt_lcfg_fork, 0,
+        "copy configuration logs for named filesystem with given name\n"
+        "usage: fork_lcfg <fsname> <newname>"},
+       {"erase_lcfg", jt_lcfg_erase, 0,
+        "permanently erase configuration logs for the named filesystem\n"
+        "usage: erase_lcfg <fsname>"},
+#endif /* HAVE_SERVER_SUPPORT */
 
        {"==== obsolete (DANGEROUS) ====", NULL, 0, "obsolete (DANGEROUS)"},
        /* network operations */