Use the default protocol and version values, when they

[nfs-utils.git] / utils / mount / stropts.c

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 25b206fd4ebe4c1740782621e44528e19b60e298..ceefdb0fc24cecb5a5215db809fbe01fece76251 100644 (file)
--- 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)
@@ -278,6 +279,19 @@ 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;
+       }
+       /*
+        * 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;
+       }
 
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
@@ -558,11 +572,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 +610,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);