Commit 18a043f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: rename nfs.upcall -> nfs.idmap
  NFS: Fix a compile issue in nfs_root
parents 31453a97 eb1c86b8

Documentation/filesystems/nfs/idmapper.txt

+14 −14
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Id mapper is used by NFS to translate user and group ids into names, and to 
translate user and group names into ids.  Part of this translation involves

performing an upcall to userspace to request the information.  Id mapper will

user request-key to perform this upcall and cache the result.  The program

/usr/sbin/nfs.upcall should be called by request-key, and will perform the

/usr/sbin/nfs.idmap should be called by request-key, and will perform the

translation and initialize a key with the resulting information.



 NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
@@ -20,12 +20,12 @@ direct the upcall. The following line should be added: 


#OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...

#======	=======	===============	===============	===============================

create	id_resolver	*	*		/usr/sbin/nfs.upcall %k %d 600

create	id_resolver	*	*		/usr/sbin/nfs.idmap %k %d 600



This will direct all id_resolver requests to the program /usr/sbin/nfs.upcall.

This will direct all id_resolver requests to the program /usr/sbin/nfs.idmap.

The last parameter, 600, defines how many seconds into the future the key will

expire.  This parameter is optional for /usr/sbin/nfs.upcall.  When the timeout

is not specified, nfs.upcall will default to 600 seconds.

expire.  This parameter is optional for /usr/sbin/nfs.idmap.  When the timeout

is not specified, nfs.idmap will default to 600 seconds.



id mapper uses for key descriptions:

	  uid:  Find the UID for the given user
@@ -40,28 +40,28 @@ would edit your request-key.conf so it look similar to this: 
#OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...

#======	=======	===============	===============	===============================

create	id_resolver	uid:*	*		/some/other/program %k %d 600

create	id_resolver	*	*		/usr/sbin/nfs.upcall %k %d 600

create	id_resolver	*	*		/usr/sbin/nfs.idmap %k %d 600



Notice that the new line was added above the line for the generic program.

request-key will find the first matching line and corresponding program.  In

this case, /some/other/program will handle all uid lookups and

/usr/sbin/nfs.upcall will handle gid, user, and group lookups.

/usr/sbin/nfs.idmap will handle gid, user, and group lookups.



See <file:Documentation/keys-request-keys.txt> for more information about the

request-key function.





==========

nfs.upcall

==========

nfs.upcall is designed to be called by request-key, and should not be run "by

=========

nfs.idmap

=========

nfs.idmap is designed to be called by request-key, and should not be run "by

hand".  This program takes two arguments, a serialized key and a key

description.  The serialized key is first converted into a key_serial_t, and

then passed as an argument to keyctl_instantiate (both are part of keyutils.h).



The actual lookups are performed by functions found in nfsidmap.h.  nfs.upcall

The actual lookups are performed by functions found in nfsidmap.h.  nfs.idmap

determines the correct function to call by looking at the first part of the

description string.  For example, a uid lookup description will appear as

"uid:user@domain".



nfs.upcall will return 0 if the key was instantiated, and non-zero otherwise.
 
nfs.idmap will return 0 if the key was instantiated, and non-zero otherwise.

fs/nfs/nfsroot.c

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static char nfs_export_path[NFS_MAXPATHLEN + 1] __initdata = ""; 
/* server:export path string passed to super.c */

static char nfs_root_device[NFS_MAXPATHLEN + 1] __initdata = "";



#ifdef RPC_DEBUG

/*

 * When the "nfsrootdebug" kernel command line option is specified,

 * enable debugging messages for NFSROOT.
@@ -112,6 +113,7 @@ static int __init nfs_root_debug(char *__unused) 
}



__setup("nfsrootdebug", nfs_root_debug);

#endif



/*

 *  Parse NFS server and directory information passed on the kernel