Merge changes from the head into mds_lock_devel

diff --git a/lustre/llite/sysctl.c b/lustre/llite/sysctl.c
index 3c4ce1f..ee4ac75 100644 (file)
--- a/lustre/llite/sysctl.c
+++ b/lustre/llite/sysctl.c
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
  * Copyright (C) 2001  Cluster File Systems, Inc.
  *
  * This code is issued under the GNU General Public License.

diff --git a/lustre/utils/parser.h b/lustre/utils/parser.h
index 6bb252f..036a651 100644 (file)
--- a/lustre/utils/parser.h
+++ b/lustre/utils/parser.h
@@ -19,12 +19,12 @@ typedef struct argcmd {
 
 int  Parser_quit(int argc, char **argv);
 void Parser_init(char *, command_t *); /* Set prompt and load command list */
-void Parser_commands(void);                    /* Start the command parser */
+int Parser_commands(void);                     /* Start the command parser */
 void Parser_qhelp(int, char **);       /* Quick help routine */
 int Parser_help(int, char **);         /* Detailed help routine */
 void Parser_exit(int, char **);                /* Shuts down command parser */
 int Parser_execarg(int argc, char **argv, command_t cmds[]);
-void execute_line(char * line);
+int execute_line(char * line);
 
 /* Converts a string to an integer */
 int Parser_int(char *, int *);