From: Neil Brown <neilb@suse.de>
Date: Fri, 16 Mar 2007 06:13:52 +0000 (+1100)
Subject: Remove some incorrect version matching code.
X-Git-Tag: nfs-utils-1-1-0-rc1~59
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3eb4c9aaa218f2af4bbea2073f02e419c50d3d3d;p=nfs-utils.git

Remove some incorrect version matching code.

The version of the interface to the kernel for requesting a mount
it entirely different to the version of NFS that is being mounted.
---

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 72cb89d..0edcc1a 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
 	else if (!strcmp(progname, "mount.nfs")) {
 		int need_statd = 0;
 		mnt_err = nfsmount(spec, mount_point, &flags,
-				   &extra_opts, &mount_opts, &nfs_mount_vers,
+				   &extra_opts, &mount_opts,
 				   0, &need_statd);
 		if (!mnt_err && !fake && need_statd)
 			start_statd();
diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h
index 1acb633..a8d1f1a 100644
--- a/utils/mount/nfs_mount.h
+++ b/utils/mount/nfs_mount.h
@@ -78,7 +78,7 @@ struct nfs_mount_data {
 #define AUTH_GSS_SPKMP		390011
 #endif
 
-int nfsmount(const char *, const char *, int *, char **, char **, int *,
+int nfsmount(const char *, const char *, int *, char **, char **,
 	     int, int *);
 void mount_errors(char *, int, int);
 
diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index db1f544..eac9590 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -830,7 +830,7 @@ nfsmnt_check_compat(const struct pmap *nfs_pmap, const struct pmap *mnt_pmap)
 
 int
 nfsmount(const char *spec, const char *node, int *flags,
-	 char **extra_opts, char **mount_opts, int *nfs_mount_vers,
+	 char **extra_opts, char **mount_opts,
 	 int running_bg, int *need_statd)
 {
 	static char *prev_bg_host;
@@ -860,11 +860,7 @@ nfsmount(const char *spec, const char *node, int *flags,
 	time_t prevt;
 	time_t timeout;
 
-	/* The version to try is either specified or 0
-	   In case it is 0 we tell the caller what we tried */
-	if (!*nfs_mount_vers)
-		*nfs_mount_vers = find_kernel_nfs_mount_version();
-	nfs_mount_version = *nfs_mount_vers;
+	nfs_mount_version = find_kernel_nfs_mount_version();
 
 	if (strlen(spec) >= sizeof(hostdir)) {
 		fprintf(stderr, _("mount: "