X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fsysctl.c;h=610fbc79d3dda9857af52fe1d03b24ea56895a4d;hb=63bd163f2fe0c885ec93004609635c7bdf945253;hp=8e74aab6595a87f65363bcca41fe55fcda67c555;hpb=dbac3b15f9157e2b3913057d058b336e807351e6;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index 8e74aab..610fbc7 100644
--- 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>
@@ -60,6 +63,8 @@ static int obd_sctl_reset( ctl_table * table, int write, struct file
 #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
 
@@ -70,9 +75,11 @@ static ctl_table obd_table[] = {
         {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,
+        {OBD_UPCALL, "upcall", obd_lustre_upcall, 128, 0644, NULL,
          &proc_dostring, &sysctl_string },
-	{ 0 }
+        {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int),
+                0644, NULL, &proc_dointvec},
+        { 0 }
 };
 
 static ctl_table parent_table[] = {