summaryrefslogtreecommitdiffstats
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2013-05-22 18:50:38 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-06-08 22:20:13 +0200
commit42c2c4249cd0192e29eec71e3e94d7bbc383c8de (patch)
tree7b82190aaaf9fd8ecb7404559b0f8cd0a49e818f /fs/nfs/super.c
parentSELinux: Add new labeling type native labels (diff)
downloadlinux-42c2c4249cd0192e29eec71e3e94d7bbc383c8de.tar.xz
linux-42c2c4249cd0192e29eec71e3e94d7bbc383c8de.zip
NFSv4.2: Added NFS v4.2 support to the NFS client
This enable NFSv4.2 support. To enable this code the CONFIG_NFS_V4_2 Kconfig define needs to be set and the -o v4.2 mount option need to be used. Signed-off-by: Steve Dickson <steved@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r--fs/nfs/super.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index c1bbb53d444a..2e94f2168b03 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -269,7 +269,7 @@ static match_table_t nfs_local_lock_tokens = {
enum {
Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0,
- Opt_vers_4_1,
+ Opt_vers_4_1, Opt_vers_4_2,
Opt_vers_err
};
@@ -280,6 +280,7 @@ static match_table_t nfs_vers_tokens = {
{ Opt_vers_4, "4" },
{ Opt_vers_4_0, "4.0" },
{ Opt_vers_4_1, "4.1" },
+ { Opt_vers_4_2, "4.2" },
{ Opt_vers_err, NULL }
};
@@ -1097,6 +1098,10 @@ static int nfs_parse_version_string(char *string,
mnt->version = 4;
mnt->minorversion = 1;
break;
+ case Opt_vers_4_2:
+ mnt->version = 4;
+ mnt->minorversion = 2;
+ break;
default:
return 0;
}