From: Bryan Schumaker <bjschuma@netapp.com>
Date: Fri, 8 Jun 2012 15:32:56 +0000 (-0400)
Subject: NFS: Use the NFS_DEFAULT_VERSION for v2 and v3 mounts
X-Git-Tag: firefly_0821_release~3680^2~2604^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c5afc8da5b881633717bfc0510792428aa01fa3f;p=firefly-linux-kernel-4.4.55.git

NFS: Use the NFS_DEFAULT_VERSION for v2 and v3 mounts

Older versions of nfs utils don't always pass a "vers=" mount option for
NFS.  This chould lead to attempts at using NFS v0 due to a zeroed out
nfs_parsed_mount_data struct.  I solve this by setting the default NFS
version to NFS_DEFAULT_VERSION in the v2 and v3 cases (v4 has already been
taken care of by a similar patch).

Reported-by: Joerg Roedel <joro@&bytes.org>
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index bdd673141e9e..906f09c7d842 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1867,6 +1867,7 @@ static int nfs23_validate_mount_data(void *options,
 	if (data == NULL)
 		goto out_no_data;
 
+	args->version = NFS_DEFAULT_VERSION;
 	switch (data->version) {
 	case 1:
 		data->namlen = 0;