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_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
+enum {
+ OBD_FAIL_LOC = 1, /* control test failures instrumentation */
+ OBD_TIMEOUT, /* RPC timeout before recovery/intr */
+ OBD_DUMP_ON_TIMEOUT, /* dump kernel debug log upon eviction */
+ OBD_UPCALL, /* path to recovery upcall */
+ OBD_MEMUSED, /* bytes currently OBD_ALLOCated */
+ OBD_SYNCFILTER, /* XXX temporary, as we play with sync osts.. */
+ OBD_LDLM_TIMEOUT, /* LDLM timeout for ASTs before client eviction */
+};
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp);
+#else
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp, loff_t *ppos);
+#endif
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},
- {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_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},
+ {OBD_DUMP_ON_TIMEOUT, "dump_on_timeout", &obd_dump_on_timeout,
+ sizeof(int), 0644, NULL, &proc_dointvec},
+ /* 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 }
+ {OBD_LDLM_TIMEOUT, "ldlm_timeout", &ldlm_timeout, sizeof(int), 0644,
+ NULL, &proc_dointvec},
+ { 0 }
};
static ctl_table parent_table[] = {
{
#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
}
obd_table_header = NULL;
#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)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp)
+#else
+int proc_fail_loc(ctl_table *table, int write, struct file *filp,
+ void *buffer, size_t *lenp, loff_t *ppos)
+#endif
{
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;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+ rc = proc_dointvec(table,write,filp,buffer,lenp);
+#else
+ rc = proc_dointvec(table,write,filp,buffer,lenp, ppos);
+#endif
+ if (old_fail_loc != obd_fail_loc)
+ wake_up(&obd_race_waitq);
+ return rc;
}