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