summaryrefslogtreecommitdiffstats
path: root/fs/nfs/Kconfig
diff options
context:
space:
mode:
authorBryan Schumaker2012-01-26 22:54:23 +0100
committerTrond Myklebust2012-02-07 00:48:01 +0100
commite6499c6f4b5f56a16f8b8ef60529c1da28b13aea (patch)
tree9212b8d42b0cb24e68c46509e3d924f2b9d30f41 /fs/nfs/Kconfig
parentNFS: Fix comparison between DS address lists (diff)
downloadkernel-qcow2-linux-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.tar.gz
kernel-qcow2-linux-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.tar.xz
kernel-qcow2-linux-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.zip
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/Kconfig')
-rw-r--r--fs/nfs/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index dbcd82126aed..021d2cf6938a 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -132,14 +132,3 @@ config NFS_USE_KERNEL_DNS
select DNS_RESOLVER
select KEYS
default y
-
-config NFS_USE_NEW_IDMAPPER
- bool "Use the new idmapper upcall routine"
- depends on NFS_V4 && KEYS
- help
- Say Y here if you want NFS to use the new idmapper upcall functions.
- You will need /sbin/request-key (usually provided by the keyutils
- package). For details, read
- <file:Documentation/filesystems/nfs/idmapper.txt>.
-
- If you are unsure, say N.