Merge b_md into HEAD

[fs/lustre-release.git] / lustre / obdclass / sysctl.c

diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index 3944b03..d1388d6 100644 (file)
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -1,3 +1,25 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ *  Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   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.
+ *
+ *   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
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
 #include <linux/module.h>
 #include <linux/autoconf.h>
 #include <linux/sysctl.h>
@@ -14,6 +36,8 @@
 #include <asm/uaccess.h>
 #include <linux/utsname.h>
 
+#define DEBUG_SUBSYSTEM S_CLASS
+
 #include <linux/obd_support.h>
 
 struct ctl_table_header *obd_table_header = NULL;
@@ -28,27 +52,35 @@ static int obd_sctl_reset( ctl_table * table, int write, struct file
 
 #define OBD_SYSCTL 300
 
-#define OBD_DEBUG           1       /* control debugging */
+#define OBD_FAIL_LOC        1       /* control test failures instrumentation */
 #define OBD_ENTRY           2       /* control enter/leave pattern */
-#define OBD_TIMEOUT         3       /* timeout on upcalls to become intrble */
-#define OBD_HARD            4       /* mount type "hard" or "soft" */
-#define OBD_VARS            5       
-#define OBD_INDEX           6
-#define OBD_RESET           7
+#define OBD_VARS            3
+#define OBD_INDEX           4
+#define OBD_RESET           5
+#define OBD_TIMEOUT         6       /* RPC timeout before recovery/intr */
+/* XXX move to /proc/sys/lustre/recovery? */
+#define OBD_UPCALL          7       /* path to recovery upcall */
+/* XXX temporary, as we play with sync osts.. */
+#define OBD_SYNCFILTER      8
 
 #define OBD_VARS_SLOT       2
 
 static ctl_table obd_table[] = {
-        {OBD_DEBUG, "debug", &obd_debug_level, sizeof(int), 0644, NULL, &proc_dointvec},
-        {OBD_ENTRY, "trace", &obd_print_entry, sizeof(int), 0644, NULL, &proc_dointvec},
+        {OBD_FAIL_LOC, "fail_loc", &obd_fail_loc, sizeof(int), 0644, NULL, &proc_dointvec},
         {OBD_VARS, "vars", &vars[0], sizeof(int), 0644, NULL, &proc_dointvec},
         {OBD_INDEX, "index", &index, sizeof(int), 0644, NULL, &obd_sctl_vars},
         {OBD_RESET, "reset", NULL, 0, 0644, NULL, &obd_sctl_reset},
+        {OBD_TIMEOUT, "timeout", &obd_timeout, sizeof(int), 0644, NULL, &proc_dointvec},
+        /* XXX need to lock so we avoid update races with the recovery upcall! */
+        {OBD_UPCALL, "recovery_upcall", obd_recovery_upcall, 128, 0644, NULL,
+         &proc_dostring, &sysctl_string },
+        {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int),
+                0644, NULL, &proc_dointvec},
        { 0 }
 };
 
 static ctl_table parent_table[] = {
-       {OBD_SYSCTL, "obd",    NULL, 0, 0555, obd_table},
+       {OBD_SYSCTL, "lustre", NULL, 0, 0555, obd_table},
        {0}
 };
 
@@ -95,7 +127,7 @@ int obd_sctl_vars (ctl_table * table, int write,
                 return rc;
 
         if ( index < 0 || index > 1 ) {
-                printk(KERN_WARNING __FUNCTION__ "Illegal index %d!\n", index);
+                CERROR("Illegal index %d!\n", index);
                 index = 0;
         } else {
                 obd_table[OBD_VARS_SLOT].data = &vars[index];
@@ -103,7 +135,3 @@ int obd_sctl_vars (ctl_table * table, int write,
 
         return rc; 
 }
-
-
-
-