---

yaml --- r: 222175 b: refs/heads/master c: 1e657bd h: refs/heads/master i: 222173: c72b912 222171: 898f426 222167: da05d62 222159: ba32f2a 222143: 2aec1e2 v: v3
git-mirror · Nov 16, 2010 · 0cf310e · 0cf310e
1 parent 6b684f6
commit 0cf310e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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;