X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fobdctl.c;h=26443aaa9df282d50bde87978de47003bad3387e;hb=fef75d4c76745e8cd35df36e4691ed66c9e5902f;hp=241bc30274c0d79d069d83695203e2d80c6b99bb;hpb=6aea6cf0aecb1f819bb8a0e9cf546d26b653e2b4;p=fs%2Flustre-release.git

diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c
index 241bc30..26443aa 100644
--- a/lustre/utils/obdctl.c
+++ b/lustre/utils/obdctl.c
@@ -1,33 +1,47 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/utils/obdctl.c
+ *
+ * Author: Peter J. Braam <braam@clusterfs.com>
+ * Author: Phil Schwan <phil@clusterfs.com>
  */
-
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "obdctl.h"
-#include "parser.h"
+#include <libcfs/libcfsutil.h>
 
 /* the functions that were in here are now in obd.c */
 
@@ -46,7 +60,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 +78,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 +105,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;
 }