LU-4961 lustre: remove liblustre.h and obd.h from userspace

[fs/lustre-release.git] / lustre / utils / lctl.c

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 7d7d0a1..5c6892c 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -45,6 +45,7 @@
 #include <lnet/lnetctl.h>
 #include "obdctl.h"
 #include <libcfs/libcfsutil.h>
+#include <lustre/lustre_idl.h>
 
 static int jt_quit(int argc, char **argv) {
         Parser_quit(argc, argv);
@@ -134,9 +135,7 @@ command_t cmdlist[] = {
          "abort recovery on a restarting MDT or OST device\n"},
         {"set_timeout", jt_lcfg_set_timeout, 0,
          "usage: conf_param obd_timeout=<secs>\n"},
-#if LUSTRE_VERSION >= OBD_OCD_VERSION(3,0,53,0)
-#warning "remove conf_param option"
-#else
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
         {"conf_param", jt_lcfg_mgsparam, 0,"set a permanent config parameter.\n"
          "This command must be run on the MGS node\n"
          "usage: conf_param [-d] <target.keyword=val>\n"
@@ -232,15 +231,32 @@ command_t cmdlist[] = {
 
        /* Nodemap commands */
        {"=== Nodemap ===", jt_noop, 0, "nodemap management"},
-       {"nodemap_activate_idmap", jt_nodemap_activate, 0,
+       {"nodemap_activate", jt_nodemap_activate, 0,
         "activate nodemap idmapping functions\n"
-        "usage: nodemap_activate_idmap"},
+        "usage: nodemap_activate"},
        {"nodemap_add", jt_nodemap_add, 0,
         "add a new nodemap\n"
         "usage: nodemap_add <nodemap_name>"},
        {"nodemap_del", jt_nodemap_del, 0,
         "remove a nodemap\n"
         "usage: nodemap_del <nodemap_name>"},
+       {"nodemap_add_range", jt_nodemap_add_range, 0,
+        "add a range to a nodemap\n"
+        "usage: nodemap_add_range <NID range>"},
+       {"nodemap_del_range", jt_nodemap_del_range, 0,
+        "add a range to a nodemap\n"
+        "usage: nodemap_del_range <NID range>"},
+       {"nodemap_modify", jt_nodemap_modify, 0,
+        "modify a nodemap parameters"
+        "usage: nodemap_modify nodemap_name param value"},
+       {"nodemap_add_idmap", jt_nodemap_add_idmap, 0,
+        "add a UID or GID mapping to a nodemap"},
+       {"nodemap_del_idmap", jt_nodemap_del_idmap, 0,
+        "delete a UID or GID mapping from a nodemap"},
+       {"nodemap_test_nid", jt_nodemap_test_nid, 0,
+        "usage: nodemap_test_nid <nid>"},
+       {"nodemap_test_id", jt_nodemap_test_id, 0,
+        "Usage: nodemap_test_id --nid <nid> --idtype [uid|gid] --id <id>"},
 
         /* Changelog commands */
         {"===  Changelogs ==", jt_noop, 0, "changelog user management"},
@@ -367,12 +383,15 @@ command_t cmdlist[] = {
        {"==== LFSCK ====", jt_noop, 0, "LFSCK"},
        {"lfsck_start", jt_lfsck_start, 0, "start LFSCK\n"
         "usage: lfsck_start <-M | --device [MDT,OST]_device>\n"
+        "                   [-A | --all] [-c | --create_ostobj [swtich]]\n"
         "                   [-e | --error error_handle] [-h | --help]\n"
-        "                   [-n | --dryrun switch] [-r | --reset]\n"
-        "                   [-s | --speed speed_limit]\n"
-        "                   [-t | --type lfsck_type[,lfsck_type...]]"},
+        "                   [-n | --dryrun [switch]] [-o | --orphan]\n"
+        "                   [-r | --reset] [-s | --speed speed_limit]\n"
+        "                   [-t | --type lfsck_type[,lfsck_type...]]\n"
+        "                   [-w | --windows win_size]"},
        {"lfsck_stop", jt_lfsck_stop, 0, "stop lfsck(s)\n"
-        "usage: lfsck_stop <-M | --device [MDT,OST]_device> [-h | --help]"},
+        "usage: lfsck_stop <-M | --device [MDT,OST]_device>\n"
+        "                  [-A | --all] [-h | --help]"},
 
        {"==== obsolete (DANGEROUS) ====", jt_noop, 0, "obsolete (DANGEROUS)"},
        /* some test scripts still use these */