fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / nfs / sysctl.c

diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
index 7a25a6d..3ea50ac 100644 (file)
--- a/fs/nfs/sysctl.c
+++ b/fs/nfs/sysctl.c
@@ -14,16 +14,10 @@
 #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;
 static struct ctl_table_header *nfs_callback_sysctl_table;
-/*
- * Something that isn't CTL_ANY, CTL_NONE or a value that may clash.
- * Use the same values as fs/lockd/svc.c
- */
-#define CTL_UNNUMBERED -2
 
 static ctl_table nfs_cb_sysctls[] = {
 #ifdef CONFIG_NFS_V4
@@ -56,48 +50,6 @@ static ctl_table nfs_cb_sysctls[] = {
                .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 }
 };