From 0cf310e4440dbe9a6bc19262f1fa9cb56a0a5179 Mon Sep 17 00:00:00 2001
From: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Date: Sun, 31 Oct 2010 18:21:05 +0200
Subject: [PATCH] --- yaml --- r: 222175 b: refs/heads/master c:
 1e657bd51f313d87fbbb22d1edf625dba87ef353 h: refs/heads/master i:   222173:
 c72b9125b3a983990d6315e5ec3da561287b44f3   222171:
 898f4267b988a492a41e0ed31833e02b6c42e035   222167:
 da05d62372cc8ef38b83ee81cd9422bd1e85c353   222159:
 ba32f2a51c8f42da730987ff4a6c5915641fa2fd   222143:
 2aec1e2c6cb6ffe819c8c44309471c44b5cde50b v: v3

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

diff --git a/[refs] b/[refs]
index f21026f056ec..dd7d852ece13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e35f8e7c61c88f9a979a4e6f7f4ffd4c158a88a
+refs/heads/master: 1e657bd51f313d87fbbb22d1edf625dba87ef353
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 0a42e8f4adcb..9587506d493c 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -67,6 +67,12 @@
 
 #define NFSDBG_FACILITY		NFSDBG_VFS
 
+#ifdef CONFIG_NFS_V3
+#define NFS_DEFAULT_VERSION 3
+#else
+#define NFS_DEFAULT_VERSION 2
+#endif
+
 enum {
 	/* Mount options that take no arguments */
 	Opt_soft, Opt_hard,
@@ -2277,7 +2283,7 @@ static int nfs_get_sb(struct file_system_type *fs_type,
 	};
 	int error = -ENOMEM;
 
-	data = nfs_alloc_parsed_mount_data(3);
+	data = nfs_alloc_parsed_mount_data(NFS_DEFAULT_VERSION);
 	mntfh = nfs_alloc_fhandle();
 	if (data == NULL || mntfh == NULL)
 		goto out_free_fh;