X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=7b63b4572128909dbe6bf61fd6084caef1a8e2b6;hb=1af166179c3f28fa9943f7844e03032f3bdae7ea;hp=25b206fd4ebe4c1740782621e44528e19b60e298;hpb=0de3189d32a183f5e91a6d27a9e8f159216d9473;p=nfs-utils.git

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 25b206f..7b63b45 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -45,6 +45,7 @@
 #include "parse_opt.h"
 #include "version.h"
 #include "parse_dev.h"
+#include "conffile.h"
 
 #ifndef NFS_PROGRAM
 #define NFS_PROGRAM	(100003)
@@ -92,6 +93,24 @@ struct nfsmount_info {
 				child;		/* forked bg child? */
 };
 
+inline void set_default_version(struct nfsmount_info *mi);
+#ifdef MOUNT_CONFIG
+inline void set_default_version(struct nfsmount_info *mi)
+{
+	extern unsigned long config_default_vers;
+	/*
+	 * Use the default value set in the config file when
+	 * the version has not been explicitly set.
+	 */
+	if (mi->version == 0 && config_default_vers) {
+		if (config_default_vers < 4)
+			mi->version = config_default_vers;
+	}
+}
+#else
+inline void set_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
+
 /*
  * Obtain a retry timeout value based on the value of the "retry=" option.
  *
@@ -257,7 +276,6 @@ static int nfs_append_sloppy_option(struct mount_options *options)
 		return 0;
 	return 1;
 }
-
 /*
  * Set up mandatory non-version specific NFS mount options.
  *
@@ -278,6 +296,17 @@ static int nfs_validate_options(struct nfsmount_info *mi)
 		return 0;
 	if (strncmp(mi->type, "nfs4", 4) == 0)
 		mi->version = 4;
+	else {
+		char *option = po_get(mi->options, "proto");
+		if (option && strcmp(option, "rdma") == 0)
+			mi->version = 3;
+	}
+
+	/*
+	 * If enabled, see if the default version was
+	 * set in the config file
+	 */
+	set_default_version(mi);
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;
@@ -558,11 +587,17 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi)
 		return result;
 	}
 
+	if (mi->version == 0) {
+		if (po_append(options, "vers=4") == PO_FAILED) {
+			errno = EINVAL;
+			goto out_fail;
+		}
+	}
+
 	if (!nfs_append_clientaddr_option(sap, mi->salen, options)) {
 		errno = EINVAL;
 		goto out_fail;
 	}
-
 	/*
 	 * Update option string to be recorded in /etc/mtab.
 	 */
@@ -590,6 +625,12 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 
 	switch (mi->version) {
 	case 0:
+		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
+			errno = 0;
+			result = nfs_try_mount_v4(mi);
+			if (errno != EPROTONOSUPPORT)
+				break;
+		}
 	case 2:
 	case 3:
 		result = nfs_try_mount_v3v2(mi);