summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2012-02-07 11:49:11 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-15 00:19:50 -0500
commit7ced286e0ade171af89d32c22b1590e1ca480542 (patch)
treeefe18b23b9c65a01c3982afe738ee633ca3b723c /fs
parentb6d1e83b4ea6cb369bdd490871f00651decdb509 (diff)
NFS: add mount options 'v4.0' and 'v4.1'
Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/super.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 94667848af9a..d18a90ba165f 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -80,7 +80,7 @@ enum {
Opt_cto, Opt_nocto,
Opt_ac, Opt_noac,
Opt_lock, Opt_nolock,
- Opt_v2, Opt_v3, Opt_v4,
+ Opt_v2, Opt_v3, Opt_v4, Opt_v4_0, Opt_v4_1,
Opt_udp, Opt_tcp, Opt_rdma,
Opt_acl, Opt_noacl,
Opt_rdirplus, Opt_nordirplus,
@@ -136,6 +136,8 @@ static const match_table_t nfs_mount_option_tokens = {
{ Opt_v2, "v2" },
{ Opt_v3, "v3" },
{ Opt_v4, "v4" },
+ { Opt_v4_0, "v4.0" },
+ { Opt_v4_1, "v4.1" },
{ Opt_udp, "udp" },
{ Opt_tcp, "tcp" },
{ Opt_rdma, "rdma" },
@@ -1172,6 +1174,16 @@ static int nfs_parse_mount_options(char *raw,
mnt->flags &= ~NFS_MOUNT_VER3;
mnt->version = 4;
break;
+ case Opt_v4_0:
+ mnt->flags &= ~NFS_MOUNT_VER3;
+ mnt->version = 4;
+ mnt->minorversion = 0;
+ break;
+ case Opt_v4_1:
+ mnt->flags &= ~NFS_MOUNT_VER3;
+ mnt->version = 4;
+ mnt->minorversion = 1;
+ break;
case Opt_udp:
mnt->flags &= ~NFS_MOUNT_TCP;
mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;