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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index ceefdb0..7b63b45 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -93,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.
  *
@@ -258,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.
  *
@@ -284,14 +301,12 @@ static int nfs_validate_options(struct nfsmount_info *mi)
 		if (option && strcmp(option, "rdma") == 0)
 			mi->version = 3;
 	}
+
 	/*
-	 * Use the default value set in the config file when
-	 * the version has not been explicitly set.
+	 * If enabled, see if the default version was
+	 * set in the config file
 	 */
-	if (mi->version == 0 && config_default_vers) {
-		if (config_default_vers < 4)
-			mi->version = config_default_vers;
-	}
+	set_default_version(mi);
 
 	if (!nfs_append_sloppy_option(mi->options))
 		return 0;