X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=fs%2Fnfs%2Fsysctl.c;fp=fs%2Fnfs%2Fsysctl.c;h=4c486eb867ca0655d2c671d1b8c5eebf050e01ac;hp=7a25a6d16ce555bebc1605c9f32ece4e0ec48aad;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c

diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
index 7a25a6d16..4c486eb86 100644
--- a/fs/nfs/sysctl.c
+++ b/fs/nfs/sysctl.c
@@ -3,6 +3,7 @@
  *
  * Sysctl interface to NFS parameters
  */
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include <linux/ctype.h>
@@ -11,10 +12,8 @@
 #include <linux/module.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_idmap.h>
-#include <linux/nfs_fs.h>
 
 #include "callback.h"
-#include "internal.h"
 
 static const int nfs_set_port_min = 0;
 static const int nfs_set_port_max = 65535;
@@ -46,57 +45,6 @@ static ctl_table nfs_cb_sysctls[] = {
 		.proc_handler = &proc_dointvec_jiffies,
 		.strategy = &sysctl_jiffies,
 	},
-#endif
-	{
-		.ctl_name	= CTL_UNNUMBERED,
-		.procname	= "nfs_mountpoint_timeout",
-		.data		= &nfs_mountpoint_expiry_timeout,
-		.maxlen		= sizeof(nfs_mountpoint_expiry_timeout),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec_jiffies,
-		.strategy	= &sysctl_jiffies,
-	},
-#ifdef CONFIG_NFS_FSCACHE
-	{
-		.ctl_name = CTL_UNNUMBERED,
-		.procname = "fscache_from_error",
-		.data = &nfs_fscache_from_error,
-		.maxlen = sizeof(int),
-		.mode = 0644,
-		.proc_handler = &proc_dointvec,
-	},
-	{
-		.ctl_name = CTL_UNNUMBERED,
-		.procname = "fscache_to_error",
-		.data = &nfs_fscache_to_error,
-		.maxlen = sizeof(int),
-		.mode = 0644,
-		.proc_handler = &proc_dointvec,
-	},
-	{
-		.ctl_name = CTL_UNNUMBERED,
-		.procname = "fscache_uncache_page",
-		.data = &nfs_fscache_uncache_page,
-		.maxlen = sizeof(int),
-		.mode = 0644,
-		.proc_handler = &proc_dointvec,
-	},
-	{
-		.ctl_name = CTL_UNNUMBERED,
-		.procname = "fscache_to_pages",
-		.data = &nfs_fscache_to_pages,
-		.maxlen = sizeof(int),
-		.mode = 0644,
-		.proc_handler = &proc_dointvec_minmax,
-	},
-	{
-		.ctl_name = CTL_UNNUMBERED,
-		.procname = "fscache_from_pages",
-		.data = &nfs_fscache_from_pages,
-		.maxlen = sizeof(int),
-		.mode = 0644,
-		.proc_handler = &proc_dointvec,
-	},
 #endif
 	{ .ctl_name = 0 }
 };