a0668fa
commit a602bea3e7ccc5ce3da61d2c18245c4058983926
a0668fa
Author: Bryan Schumaker <bjschuma@netapp.com>
a0668fa
Date:   Thu Jan 26 16:54:25 2012 -0500
a0668fa
a0668fa
    NFS: Update idmapper documentation
a0668fa
    
a0668fa
    Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
a0668fa
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
a0668fa
a0668fa
diff -up linux-3.2.noarch/Documentation/filesystems/nfs/idmapper.txt.orig linux-3.2.noarch/Documentation/filesystems/nfs/idmapper.txt
a0668fa
--- linux-3.2.noarch/Documentation/filesystems/nfs/idmapper.txt.orig	2012-01-04 18:55:44.000000000 -0500
a0668fa
+++ linux-3.2.noarch/Documentation/filesystems/nfs/idmapper.txt	2012-01-27 10:19:55.406740364 -0500
a0668fa
@@ -4,13 +4,21 @@ ID Mapper
a0668fa
 =========
a0668fa
 Id mapper is used by NFS to translate user and group ids into names, and to
a0668fa
 translate user and group names into ids.  Part of this translation involves
a0668fa
-performing an upcall to userspace to request the information.  Id mapper will
a0668fa
-user request-key to perform this upcall and cache the result.  The program
a0668fa
-/usr/sbin/nfs.idmap should be called by request-key, and will perform the
a0668fa
-translation and initialize a key with the resulting information.
a0668fa
+performing an upcall to userspace to request the information.  There are two
a0668fa
+ways NFS could obtain this information: placing a call to /sbin/request-key
a0668fa
+or by placing a call to the rpc.idmap daemon.
a0668fa
+
a0668fa
+NFS will attempt to call /sbin/request-key first.  If this succeeds, the
a0668fa
+result will be cached using the generic request-key cache.  This call should
a0668fa
+only fail if /etc/request-key.conf is not configured for the id_resolver key
a0668fa
+type, see the "Configuring" section below if you wish to use the request-key
a0668fa
+method.
a0668fa
+
a0668fa
+If the call to /sbin/request-key fails (if /etc/request-key.conf is not
a0668fa
+configured with the id_resolver key type), then the idmapper will ask the
a0668fa
+legacy rpc.idmap daemon for the id mapping.  This result will be stored
a0668fa
+in a custom NFS idmap cache.
a0668fa
 
a0668fa
- NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
a0668fa
- feature.
a0668fa
 
a0668fa
 ===========
a0668fa
 Configuring