From 4d567269991b95ff73a9dbee62c35d541edf9a57 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 12 Jun 2008 12:37:33 -0400 Subject: [PATCH] --- yaml --- r: 101927 b: refs/heads/master c: ecbb3845dd678364148c1faad32adbc9dd833ef9 h: refs/heads/master i: 101925: a5f88f8392c6737f43e6c74fccf1ce4e837e2462 101923: d6510ac2a833340fa3818d7aa4b27e11450a5f61 101919: e19e1467f90c98d0ffed767ec87fa58c86095874 v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47b42e12d619..4448e10bc6db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f41f741838480aeaa3a189cff6e210503cf9c42d +refs/heads/master: ecbb3845dd678364148c1faad32adbc9dd833ef9 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index b550e921f661..5278eef61110 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -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" },