diff options
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 0a42e8f4adcb..3c045044fca2 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -39,7 +39,6 @@  #include <linux/nfs_mount.h>  #include <linux/nfs4_mount.h>  #include <linux/lockd/bind.h> -#include <linux/smp_lock.h>  #include <linux/seq_file.h>  #include <linux/mount.h>  #include <linux/mnt_namespace.h> @@ -67,6 +66,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 +2282,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;  | 
