commit 84e8186d1ad1f280c2a849349efbddab1f1fe16d

From: Steve Dickson <steved@redhat.com>

Removed some old mounting versioning code that was
    stopping tcp mount from working with alpha servers

    Signed-off-by: Steve Dickson <steved@redhat.com>
---

 utils/mount/mount.c     |    2 +-
 utils/mount/nfs_mount.h |    2 +-
 utils/mount/nfsmount.c  |    7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 00aee61..b3d3696 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
 	else {
 		if (!strcmp(progname, "mount.nfs")) {
 			mnt_err = nfsmount(spec, mount_point, &flags,
-					&extra_opts, &mount_opts, &nfs_mount_vers, 0);
+					&extra_opts, &mount_opts,  0);
 		}
 	}
 	if (fake)
diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h
index 2200362..69531b4 100644
--- a/utils/mount/nfs_mount.h
+++ b/utils/mount/nfs_mount.h
@@ -78,7 +78,7 @@ #define AUTH_GSS_SPKMI		390010
 #define AUTH_GSS_SPKMP		390011
 #endif
 
-int nfsmount(const char *, const char *, int *, char **, char **, int *, int);
+int nfsmount(const char *, const char *, int *, char **, char **, int);
 void mount_errors(char *, int, int);
 int contains(const char *, const char *);
 char *get_value(const char *, const char *);
diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 7759260..3ca9b80 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -818,8 +818,7 @@ nfsmnt_check_compat(const struct pmap *n
 
 int
 nfsmount(const char *spec, const char *node, int *flags,
-	 char **extra_opts, char **mount_opts, int *nfs_mount_vers,
-	 int running_bg)
+	 char **extra_opts, char **mount_opts, int running_bg)
 {
 	static char *prev_bg_host;
 	char hostdir[1024];
@@ -850,9 +849,7 @@ nfsmount(const char *spec, const char *n
 
 	/* 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();
 
 	retval = EX_FAIL;
 	fsock = -1;