Commit ecbb3845 authored Jun 12, 2008 by Chuck Lever Committed by Trond Myklebust Jul 09, 2008

NFS: Allow any value for the "retry" option

The kernel NFS mount option parser should ignore the retry= mount option
since it is meaningful only in user space. Today it expects a number
rather than arbitrary text, so it ignores the option if the value is
numeric, but chokes if there are other characters in the value.

Change it to allow any text (except ",") as its value.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent f41f7418

fs/nfs/super.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -101,6 +101,8 @@ enum {
		static match_table_t nfs_mount_option_tokens = {
		{ Opt_userspace, "bg" },
		{ Opt_userspace, "fg" },
		{ Opt_userspace, "retry=%s" },

		{ Opt_soft, "soft" },
		{ Opt_hard, "hard" },
		{ Opt_intr, "intr" },
		@@ -136,7 +138,6 @@ static match_table_t nfs_mount_option_tokens = {
		{ Opt_acdirmin, "acdirmin=%u" },
		{ Opt_acdirmax, "acdirmax=%u" },
		{ Opt_actimeo, "actimeo=%u" },
		{ Opt_userspace, "retry=%u" },
		{ Opt_namelen, "namlen=%u" },
		{ Opt_mountport, "mountport=%u" },
		{ Opt_mountvers, "mountvers=%u" },

Admin message