Add new command to allow obdctl usage from command-line.

usage: --device <devno> <command [args ...]>

This is exactly the same thing as:
	obdctl <<- EOF
	device <devno>
	connect
	command [args ...]
	disconnect
	EOF

You can use it to run simple obdctl commands, for example:

	tests/llecho.sh
	util/obdctl --device 2 test_getattr 1000 q
	util/obdctl --device 2 test_brw 1000 w q
	tests/llmountcleanup.sh

diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c
index 4c1e2bb..1cf7e18 100644 (file)
--- a/lustre/utils/obdctl.c
+++ b/lustre/utils/obdctl.c
@@ -226,6 +226,40 @@ static int jt_disconnect(int argc, char **argv)
         return rc;
 }
 
+static int jt__device(int argc, char **argv)
+{
+        char *arg2[20];
+        int rc;
+
+        if (argc < 3) {
+                fprintf(stderr, "usage: %s devno <command [args ...]>\n",
+                        argv[0]);
+                return -1;
+        }
+
+        arg2[0] = "device";
+        arg2[1] = argv[1];
+        arg2[2] = NULL;
+        rc = jt_device(2, arg2);
+
+        if (!rc) {
+                arg2[0] = "connect";
+                arg2[1] = NULL;
+                rc = jt_connect(1, arg2);
+        }
+
+        if (!rc)
+                rc = Parser_execarg(argc - 2, &argv[2], cmdlist);
+
+        if (!rc) {
+                arg2[0] = "disconnect";
+                arg2[1] = NULL;
+                rc = jt_disconnect(1, arg2);
+        }
+
+        return rc;
+}
+
 static int jt_detach(int argc, char **argv)
 {
         struct obd_ioctl_data data;
@@ -650,6 +684,7 @@ static int jt_test_ldlm(int argc, char **argv)
 }
 
 command_t cmdlist[] = {
+        {"--device", jt__device, 0, "device <devno> <command [args ...]>"},
         {"device", jt_device, 0, "set current device (args device no)"},
         {"attach", jt_attach, 0, "name the type of device (args: type data"},
         {"setup", jt_setup, 0, "setup device (args: <blkdev> [data]"},