Branch b1_6

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

diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c
index 241bc30..26bedd1 100644 (file)
--- a/lustre/utils/obdctl.c
+++ b/lustre/utils/obdctl.c
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -46,7 +45,7 @@ command_t cmdlist[] = {
          "--threads <threads> <devno> <command [args ...]>"},
 
         /* Device configuration commands */
-        {"lovconfig", jt_obd_lov_config, 0, "configure lov data on MDS "
+        {"lov_setconfig", jt_obd_lov_setconfig, 0, "configure lov data on MDS "
          "[usage: lovconfig lov-uuid stripecount, stripesize, pattern, UUID1, [UUID2, ...]"},
         {"list", jt_obd_list, 0, "list the devices (no args)"},
         {"newdev", jt_obd_newdev, 0, "set device to a new unused obd (no args)"},
@@ -64,14 +63,14 @@ command_t cmdlist[] = {
          "disconnect - break connection to device"},
 
         /* Session operations */
-        {"create", jt_obd_create, 0, "create [count [mode [verbose]]]"},
-        {"destroy", jt_obd_destroy, 0, "destroy <id>"},
+        {"create", jt_obd_create, 0, "create <count> [mode [verbose]]"},
+        {"destroy", jt_obd_destroy, 0, "destroy <id> [count [verbose]]"},
         {"getattr", jt_obd_getattr, 0, "getattr <id>"},
         {"setattr", jt_obd_setattr, 0, "setattr <id> <mode>"},
-        {"newconn", jt_obd_newconn, 0, "newconn [newuuid]"},
-        {"test_getattr", jt_obd_test_getattr, 0, "test_getattr <count> [verbose]"},
-        {"test_brw", jt_obd_test_brw, 0, "test_brw <count> [write [verbose [pages [objid]]]]"},
-        {"test_ldlm", jt_obd_test_ldlm, 0, "test lock manager (no args)"},
+        {"newconn", jt_obd_newconn, 0, "newconn <olduuid> [newuuid]"},
+        {"test_getattr", jt_obd_test_getattr, 0, "test_getattr <count> [verbose [[t]objid]]"},
+        {"test_setattr", jt_obd_test_setattr, 0, "test_setattr <count> [verbose [[t]objid]]"},
+        {"test_brw", jt_obd_test_brw, 0, "test_brw [t]<count> [write [verbose [pages [[t]objid]]]]"},
         {"dump_ldlm", jt_obd_dump_ldlm, 0, "dump all lock manager state (no args)"},
 
         /* User interface commands */
@@ -91,13 +90,14 @@ int main(int argc, char **argv)
         if (obd_initialize(argc, argv) < 0)
                 exit(1);
 
+        Parser_init("obdctl > ", cmdlist);
+
         if (argc > 1) {
                 rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
         } else {
-                Parser_init("obdctl > ", cmdlist);
                 rc = Parser_commands();
         }
 
-        obd_cleanup(argc, argv);
+        obd_finalize(argc, argv);
         return rc;
 }