From bc902a61ce0a7d3d3546b2012c92a6f095bd2be6 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 8 Sep 2009 19:50:07 -0400
Subject: [PATCH] --- yaml --- r: 158615 b: refs/heads/master c:
 2ecda72b49a0849ce41e7fa1fa974a245b9119f8 h: refs/heads/master i:   158613:
 9d192b108edf2076f00639d1bf23c41cab8344b3   158611:
 51d3aaf5475344331a2e1e21a94239e014bc2d3e   158607:
 868ff0ad3f1239198f9551a7036d676075be34ff v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c9311fde41f5..af6df3b47537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 764302ccb88dd0df062eccd507b6c6de24f1c560
+refs/heads/master: 2ecda72b49a0849ce41e7fa1fa974a245b9119f8
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 34b1ccf51adf..867f70504531 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2321,6 +2321,12 @@ static int nfs4_validate_text_mount_data(void *options,
 
 	nfs4_validate_mount_flags(args);
 
+	if (args->version != 4) {
+		dfprintk(MOUNT,
+			 "NFS4: Illegal mount version\n");
+		return -EINVAL;
+	}
+
 	if (args->auth_flavor_len > 1) {
 		dfprintk(MOUNT,
 			 "NFS4: Too many RPC auth flavours specified\n");