aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-06-12 12:37:33 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-09 12:09:20 -0400
commitecbb3845dd678364148c1faad32adbc9dd833ef9 (patch)
tree4ccd2237499f80586cb23ae0c2b00a092cb4e455 /fs/nfs/super.c
parentf41f741838480aeaa3a189cff6e210503cf9c42d (diff)
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>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r--fs/nfs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b550e921f661..5278eef61110 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -101,6 +101,8 @@ enum {
101static match_table_t nfs_mount_option_tokens = { 101static match_table_t nfs_mount_option_tokens = {
102 { Opt_userspace, "bg" }, 102 { Opt_userspace, "bg" },
103 { Opt_userspace, "fg" }, 103 { Opt_userspace, "fg" },
104 { Opt_userspace, "retry=%s" },
105
104 { Opt_soft, "soft" }, 106 { Opt_soft, "soft" },
105 { Opt_hard, "hard" }, 107 { Opt_hard, "hard" },
106 { Opt_intr, "intr" }, 108 { Opt_intr, "intr" },
@@ -136,7 +138,6 @@ static match_table_t nfs_mount_option_tokens = {
136 { Opt_acdirmin, "acdirmin=%u" }, 138 { Opt_acdirmin, "acdirmin=%u" },
137 { Opt_acdirmax, "acdirmax=%u" }, 139 { Opt_acdirmax, "acdirmax=%u" },
138 { Opt_actimeo, "actimeo=%u" }, 140 { Opt_actimeo, "actimeo=%u" },
139 { Opt_userspace, "retry=%u" },
140 { Opt_namelen, "namlen=%u" }, 141 { Opt_namelen, "namlen=%u" },
141 { Opt_mountport, "mountport=%u" }, 142 { Opt_mountport, "mountport=%u" },
142 { Opt_mountvers, "mountvers=%u" }, 143 { Opt_mountvers, "mountvers=%u" },