From 73c0e4b51bb48c6ac97756b0b7bb9638eb7f0228 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 2 Mar 2012 14:06:39 -0500
Subject: [PATCH] --- yaml --- r: 294506 b: refs/heads/master c:
 3862279a5fcf44d0c68fa54a507a5bcd2ab4f0b7 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/super.c | 31 +++----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index f66f9745f9e6..bfbbcff453b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bbceb6f2bdda67054bc66035a9543623e539126
+refs/heads/master: 3862279a5fcf44d0c68fa54a507a5bcd2ab4f0b7
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 7f0c93f8afe3..f4ccdae6a0cf 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -80,7 +80,6 @@ enum {
 	Opt_cto, Opt_nocto,
 	Opt_ac, Opt_noac,
 	Opt_lock, Opt_nolock,
-	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,
@@ -133,11 +132,6 @@ static const match_table_t nfs_mount_option_tokens = {
 	{ Opt_noac, "noac" },
 	{ Opt_lock, "lock" },
 	{ Opt_nolock, "nolock" },
-	{ 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" },
@@ -183,6 +177,9 @@ static const match_table_t nfs_mount_option_tokens = {
 	{ Opt_fscache_uniq, "fsc=%s" },
 	{ Opt_local_lock, "local_lock=%s" },
 
+	/* The following needs to be listed after all other options */
+	{ Opt_nfsvers, "v%s" },
+
 	{ Opt_err, NULL }
 };
 
@@ -1228,28 +1225,6 @@ static int nfs_parse_mount_options(char *raw,
 			mnt->flags |= (NFS_MOUNT_LOCAL_FLOCK |
 				       NFS_MOUNT_LOCAL_FCNTL);
 			break;
-		case Opt_v2:
-			mnt->flags &= ~NFS_MOUNT_VER3;
-			mnt->version = 2;
-			break;
-		case Opt_v3:
-			mnt->flags |= NFS_MOUNT_VER3;
-			mnt->version = 3;
-			break;
-		case Opt_v4:
-			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;