Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
index 4c486eb..7a25a6d 100644 (file)
--- a/fs/nfs/sysctl.c
+++ b/fs/nfs/sysctl.c
@@ -3,7 +3,6 @@
  *
  * Sysctl interface to NFS parameters
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include <linux/ctype.h>
@@ -12,8 +11,10 @@
 #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;
@@ -45,6 +46,57 @@ 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 }
 };