Don't crash in expired_lock_main() with racing client eviction/lock completion.

[fs/lustre-release.git] / lnet / utils / parser.c

diff --git a/lnet/utils/parser.c b/lnet/utils/parser.c
index 4d93645..db5292d 100644 (file)
--- a/lnet/utils/parser.c
+++ b/lnet/utils/parser.c
@@ -80,7 +80,7 @@ static int line2args(char *line, char **argv, int maxargs)
 
     arg = strtok(line, " \t");
     if ( arg ) {
-       argv[i] = arg;
+            argv[i] = arg;
        i++;
     } else
        return 0;
@@ -110,7 +110,10 @@ int Parser_execarg(int argc, char **argv, command_t cmds[])
 
         cmd = Parser_findargcmd(argv[0], cmds);
        if ( cmd ) {
-               return (cmd->pc_func)(argc, argv);
+                int rc = (cmd->pc_func)(argc, argv);
+                if (rc == CMD_HELP)
+                        fprintf(stderr, "%s\n", cmd->pc_help);
+                return rc;
        } else {
                printf("Try interactive use without arguments or use one of:\n");
                for (cmd = cmds; cmd->pc_name; cmd++)
@@ -676,6 +679,7 @@ int Parser_bool (int *b, char *str) {
         if (!strcasecmp (str, "no") ||
             !strcasecmp (str, "n") ||
             !strcasecmp (str, "off") ||
+            !strcasecmp (str, "down") ||
             !strcasecmp (str, "disable"))
         {
                 *b = 0;
@@ -685,6 +689,7 @@ int Parser_bool (int *b, char *str) {
         if (!strcasecmp (str, "yes") ||
             !strcasecmp (str, "y") ||
             !strcasecmp (str, "on") ||
+            !strcasecmp (str, "up") ||
             !strcasecmp (str, "enable"))
         {
                 *b = 1;