summaryrefslogtreecommitdiffstats
path: root/fs/nfs/sysctl.c
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-01-26 16:54:23 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-06 18:48:01 -0500
commite6499c6f4b5f56a16f8b8ef60529c1da28b13aea (patch)
tree9212b8d42b0cb24e68c46509e3d924f2b9d30f41 /fs/nfs/sysctl.c
parent2d3fe01c36a9b881fae89c5bdf4085a4d7d53ae1 (diff)
downloadlinux-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.tar.bz2
NFS: Fall back on old idmapper if request_key() fails
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>
Diffstat (limited to 'fs/nfs/sysctl.c')
-rw-r--r--fs/nfs/sysctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
index 978aaeb8a093..ad4d2e787b20 100644
--- a/fs/nfs/sysctl.c
+++ b/fs/nfs/sysctl.c
@@ -32,7 +32,6 @@ static ctl_table nfs_cb_sysctls[] = {
.extra1 = (int *)&nfs_set_port_min,
.extra2 = (int *)&nfs_set_port_max,
},
-#ifndef CONFIG_NFS_USE_NEW_IDMAPPER
{
.procname = "idmap_cache_timeout",
.data = &nfs_idmap_cache_timeout,
@@ -40,7 +39,6 @@ static ctl_table nfs_cb_sysctls[] = {
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
-#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */
#endif
{
.procname = "nfs_mountpoint_timeout",