From 6c70fd00390986ce2feb45ef02c361d7484c635f Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Tue, 5 Jun 2012 14:59:54 -0400
Subject: [PATCH] --- yaml --- r: 310948 b: refs/heads/master c:
 cdf66442fab82916fe38f928b4f91815195a294c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dd4cfafcc89f..752a7f60adfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bda197f5d71d56b95a84c0ccbcb8ce2691106cca
+refs/heads/master: cdf66442fab82916fe38f928b4f91815195a294c
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index ff656c022684..bdd673141e9e 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2637,6 +2637,8 @@ static int nfs4_validate_mount_data(void *options,
 	if (data == NULL)
 		goto out_no_data;
 
+	args->version = 4;
+
 	switch (data->version) {
 	case 1:
 		if (data->host_addrlen > sizeof(args->nfs_server.address))