Skip to content

Commit

Permalink
Regression: fix mounting NFS when NFSv3 support is not compiled
Browse files Browse the repository at this point in the history
Trying to mount NFS (root partition in my case) fails if CONFIG_NFS_V3
is not selected. nfs_validate_mount_data() returns EPROTONOSUPPORT,
because of this check:

#ifndef CONFIG_NFS_V3
	if (args->version == 3)
		goto out_v3_not_compiled;
#endif /* !CONFIG_NFS_V3 */

and args->version was always initialized to 3.

It was working in 2.6.36

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Paulius Zaleckas authored and Trond Myklebust committed Nov 16, 2010
1 parent 8e35f8e commit 1e657bd
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1e657bd

Please sign in to comment.