Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (74eb94b2) · Commits · 戴 / test

Documentation/filesystems/nfs/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,5 @@ nfsroot.txt
		- short guide on setting up a diskless box with NFS root filesystem.
		rpc-cache.txt
		- introduction to the caching mechanisms in the sunrpc layer.
		idmapper.txt
		- information for configuring request-keys to be used by idmapper

Documentation/filesystems/nfs/idmapper.txt

0 → 100644

+67 −0

Original line number	Diff line number	Diff line

		=========
		ID Mapper
		=========
		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
		translation and initialize a key with the resulting information.

		NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
		feature.

		===========
		Configuring
		===========
		The file /etc/request-key.conf will need to be modified so /sbin/request-key can
		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

		This will direct all id_resolver requests to the program /usr/sbin/nfs.upcall.
		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.

		id mapper uses for key descriptions:
		uid: Find the UID for the given user
		gid: Find the GID for the given group
		user: Find the user name for the given UID
		group: Find the group name for the given GID

		You can handle any of these individually, rather than using the generic upcall
		program. If you would like to use your own program for a uid lookup then you
		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

		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.

		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
		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
		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.

Documentation/filesystems/nfs/nfsroot.txt

+22 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,28 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
		Default: any


		nfsrootdebug

		This parameter enables debugging messages to appear in the kernel
		log at boot time so that administrators can verify that the correct
		NFS mount options, server address, and root path are passed to the
		NFS client.


		rdinit=<executable file>

		To specify which file contains the program that starts system
		initialization, administrators can use this command line parameter.
		The default value of this parameter is "/init". If the specified
		file exists and the kernel can execute it, root filesystem related
		kernel command line parameters, including `nfsroot=', are ignored.

		A description of the process of mounting the root file system can be
		found in:

		Documentation/early-userspace/README




		3.) Boot Loader

Documentation/kernel-parameters.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -1541,12 +1541,15 @@ and is between 256 and 4096 characters. It is defined in the file
		1 to enable accounting
		Default value is 0.

		nfsaddrs= [NFS]
		nfsaddrs= [NFS] Deprecated. Use ip= instead.
		See Documentation/filesystems/nfs/nfsroot.txt.

		nfsroot= [NFS] nfs root filesystem for disk-less boxes.
		See Documentation/filesystems/nfs/nfsroot.txt.

		nfsrootdebug [NFS] enable nfsroot debugging messages.
		See Documentation/filesystems/nfs/nfsroot.txt.

		nfs.callback_tcpport=
		[NFS] set the TCP port on which the NFSv4 callback
		channel should listen.

fs/lockd/clntlock.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ struct nlm_wait {
		};

		static LIST_HEAD(nlm_blocked);
		static DEFINE_SPINLOCK(nlm_blocked_lock);

		/**
		* nlmclnt_init - Set up per-NFS mount point lockd data structures
		@@ -97,7 +98,10 @@ struct nlm_wait nlmclnt_prepare_block(struct nlm_host host, struct file_lock *
		block->b_lock = fl;
		init_waitqueue_head(&block->b_wait);
		block->b_status = nlm_lck_blocked;

		spin_lock(&nlm_blocked_lock);
		list_add(&block->b_list, &nlm_blocked);
		spin_unlock(&nlm_blocked_lock);
		}
		return block;
		}
		@@ -106,7 +110,9 @@ void nlmclnt_finish_block(struct nlm_wait *block)
		{
		if (block == NULL)
		return;
		spin_lock(&nlm_blocked_lock);
		list_del(&block->b_list);
		spin_unlock(&nlm_blocked_lock);
		kfree(block);
		}

		@@ -154,6 +160,7 @@ __be32 nlmclnt_grant(const struct sockaddr addr, const struct nlm_lock lock)
		* Look up blocked request based on arguments.
		* Warning: must not use cookie to match it!
		*/
		spin_lock(&nlm_blocked_lock);
		list_for_each_entry(block, &nlm_blocked, b_list) {
		struct file_lock *fl_blocked = block->b_lock;

		@@ -178,6 +185,7 @@ __be32 nlmclnt_grant(const struct sockaddr addr, const struct nlm_lock lock)
		wake_up(&block->b_wait);
		res = nlm_granted;
		}
		spin_unlock(&nlm_blocked_lock);
		return res;
		}

		@@ -216,10 +224,6 @@ reclaimer(void *ptr)
		allow_signal(SIGKILL);

		down_write(&host->h_rwsem);

		/* This one ensures that our parent doesn't terminate while the
		* reclaim is in progress */
		lock_kernel();
		lockd_up(); /* note: this cannot fail as lockd is already running */

		dprintk("lockd: reclaiming locks for host %s\n", host->h_name);
		@@ -260,16 +264,17 @@ restart:
		dprintk("NLM: done reclaiming locks for host %s\n", host->h_name);

		/* Now, wake up all processes that sleep on a blocked lock */
		spin_lock(&nlm_blocked_lock);
		list_for_each_entry(block, &nlm_blocked, b_list) {
		if (block->b_host == host) {
		block->b_status = nlm_lck_denied_grace_period;
		wake_up(&block->b_wait);
		}
		}
		spin_unlock(&nlm_blocked_lock);

		/* Release host handle after use */
		nlm_release_host(host);
		lockd_down();
		unlock_kernel();
		return 0;
		}

Admin message