[PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism

[Steve Dickson <steved@redhat.com>]

To solve deadlocks that can occur between the rpc.idmapd daemon
and the kernel, enables the in-kernel upcall mechanism that 
uses the key rings to start the user/group ids.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 fs/nfs/Kconfig |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index dbcd821..94ad028 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -134,12 +134,6 @@ config NFS_USE_KERNEL_DNS
 	default y
 
 config NFS_USE_NEW_IDMAPPER
-	bool "Use the new idmapper upcall routine"
+	bool "Use the 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.
+	default y
-- 
1.7.6.4