Land b_smallfix onto HEAD (20040423_1603)

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

diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index 57ae735..158a2de 100644 (file)
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -26,7 +26,10 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/swapctl.h>
+#endif
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
@@ -42,32 +45,32 @@
 
 struct ctl_table_header *obd_table_header = NULL;
 
-static int vars[2];
-static int index = 0;
-
-static int obd_sctl_vars( ctl_table * table, int write, struct file *
-                          filp, void * buffer, size_t * lenp );
-static int obd_sctl_reset( ctl_table * table, int write, struct file
-                           * filp, void * buffer, size_t * lenp );
-
 #define OBD_SYSCTL 300
 
-#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
+enum {
+        OBD_FAIL_LOC = 1,       /* control test failures instrumentation */
+        OBD_TIMEOUT,            /* RPC timeout before recovery/intr */
+        OBD_UPCALL,             /* path to recovery upcall */
+        OBD_MEMUSED,            /* bytes currently OBD_ALLOCated */
+        OBD_SYNCFILTER,         /* XXX temporary, as we play with sync osts.. */
+};
 
-#define OBD_VARS_SLOT       2
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+                  void *buffer, size_t *lenp);
 
 static ctl_table obd_table[] = {
-        {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},
-       { 0 }
+        {OBD_FAIL_LOC, "fail_loc", &obd_fail_loc, sizeof(int), 0644, NULL,
+                &proc_dointvec},
+        {OBD_TIMEOUT, "timeout", &obd_timeout, sizeof(int), 0644, NULL,
+                &proc_fail_loc},
+        /* XXX need to lock so we avoid update races with recovery upcall! */
+        {OBD_UPCALL, "upcall", obd_lustre_upcall, 128, 0644, NULL,
+                &proc_dostring, &sysctl_string },
+        {OBD_MEMUSED, "memused", (int *)&obd_memory.counter,
+                sizeof(int), 0644, NULL, &proc_dointvec},
+        {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int),
+                0644, NULL, &proc_dointvec},
+        { 0 }
 };
 
 static ctl_table parent_table[] = {
@@ -79,7 +82,7 @@ void obd_sysctl_init (void)
 {
 #ifdef CONFIG_SYSCTL
         if ( !obd_table_header )
-                obd_table_header = register_sysctl_table(parent_table, 0); 
+                obd_table_header = register_sysctl_table(parent_table, 0);
 #endif
 }
 
@@ -92,37 +95,14 @@ void obd_sysctl_clean (void)
 #endif
 }
 
-int obd_sctl_reset (ctl_table * table, int write, 
-                    struct file * filp, void * buffer, 
-                    size_t * lenp)
-{
-        if ( write ) {
-                /* do something here */
-                vars[0]=0;
-                vars[1]=0;
-        }
-
-        *lenp = 0;
-        return 0;
-}
-
-int obd_sctl_vars (ctl_table * table, int write, 
-                   struct file * filp, void * buffer, 
-                   size_t * lenp)
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+                  void *buffer, size_t *lenp)
 {
         int rc;
+        int old_fail_loc = obd_fail_loc;
 
-        rc = proc_dointvec(table, write, filp, buffer, lenp);
-
-        if ( rc ) 
-                return rc;
-
-        if ( index < 0 || index > 1 ) {
-                CERROR("Illegal index %d!\n", index);
-                index = 0;
-        } else {
-                obd_table[OBD_VARS_SLOT].data = &vars[index];
-        }
-
-        return rc; 
+        rc = proc_dointvec(table,write,filp,buffer,lenp);
+        if (old_fail_loc != obd_fail_loc)
+                wake_up(&obd_race_waitq);
+        return rc;
 }