e6499c6f4b
This patch removes the CONFIG_NFS_USE_NEW_IDMAPPER compile option. First, the idmapper will attempt to map the id using /sbin/request-key and nfsidmap. If this fails (if /etc/request-key.conf is not configured properly) then the idmapper will call the legacy code to perform the mapping. I left a comment stating where the legacy code begins to make it easier for somebody to remove in the future. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
90 lines
1.8 KiB
C
90 lines
1.8 KiB
C
/*
|
|
* linux/fs/nfs/sysctl.c
|
|
*
|
|
* Sysctl interface to NFS parameters
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/sysctl.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nfs4.h>
|
|
#include <linux/nfs_idmap.h>
|
|
#include <linux/nfs_fs.h>
|
|
|
|
#include "callback.h"
|
|
|
|
#ifdef CONFIG_NFS_V4
|
|
static const int nfs_set_port_min = 0;
|
|
static const int nfs_set_port_max = 65535;
|
|
#endif
|
|
static struct ctl_table_header *nfs_callback_sysctl_table;
|
|
|
|
static ctl_table nfs_cb_sysctls[] = {
|
|
#ifdef CONFIG_NFS_V4
|
|
{
|
|
.procname = "nfs_callback_tcpport",
|
|
.data = &nfs_callback_set_tcpport,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (int *)&nfs_set_port_min,
|
|
.extra2 = (int *)&nfs_set_port_max,
|
|
},
|
|
{
|
|
.procname = "idmap_cache_timeout",
|
|
.data = &nfs_idmap_cache_timeout,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
},
|
|
#endif
|
|
{
|
|
.procname = "nfs_mountpoint_timeout",
|
|
.data = &nfs_mountpoint_expiry_timeout,
|
|
.maxlen = sizeof(nfs_mountpoint_expiry_timeout),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_jiffies,
|
|
},
|
|
{
|
|
.procname = "nfs_congestion_kb",
|
|
.data = &nfs_congestion_kb,
|
|
.maxlen = sizeof(nfs_congestion_kb),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec,
|
|
},
|
|
{ }
|
|
};
|
|
|
|
static ctl_table nfs_cb_sysctl_dir[] = {
|
|
{
|
|
.procname = "nfs",
|
|
.mode = 0555,
|
|
.child = nfs_cb_sysctls,
|
|
},
|
|
{ }
|
|
};
|
|
|
|
static ctl_table nfs_cb_sysctl_root[] = {
|
|
{
|
|
.procname = "fs",
|
|
.mode = 0555,
|
|
.child = nfs_cb_sysctl_dir,
|
|
},
|
|
{ }
|
|
};
|
|
|
|
int nfs_register_sysctl(void)
|
|
{
|
|
nfs_callback_sysctl_table = register_sysctl_table(nfs_cb_sysctl_root);
|
|
if (nfs_callback_sysctl_table == NULL)
|
|
return -ENOMEM;
|
|
return 0;
|
|
}
|
|
|
|
void nfs_unregister_sysctl(void)
|
|
{
|
|
unregister_sysctl_table(nfs_callback_sysctl_table);
|
|
nfs_callback_sysctl_table = NULL;
|
|
}
|