mount.nfs: Assume v2/v3 if mount-related options are present

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 25b206fd4ebe4c1740782621e44528e19b60e298..a0b9e7fdf80a0f8967bda37c05b1ee34444769a0 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)
@@ -92,6 +93,25 @@ struct nfsmount_info {
                                child;          /* forked bg child? */
 };
 
+#ifdef MOUNT_CONFIG
+static void nfs_default_version(struct nfsmount_info *mi);
+
+static void nfs_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 nfs_default_version(struct nfsmount_info *mi) {}
+#endif /* MOUNT_CONFIG */
+
 /*
  * Obtain a retry timeout value based on the value of the "retry=" option.
  *
@@ -258,6 +278,40 @@ static int nfs_append_sloppy_option(struct mount_options *options)
        return 1;
 }
 
+static int nfs_set_version(struct nfsmount_info *mi)
+{
+       if (!nfs_nfs_version(mi->options, &mi->version))
+               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 we still don't know, check for version-specific
+        * mount options.
+        */
+       if (mi->version == 0) {
+               if (po_contains(mi->options, "mounthost") ||
+                   po_contains(mi->options, "mountaddr") ||
+                   po_contains(mi->options, "mountvers") ||
+                   po_contains(mi->options, "mountproto"))
+                       mi->version = 3;
+       }
+
+       /*
+        * If enabled, see if the default version was
+        * set in the config file
+        */
+       nfs_default_version(mi);
+       
+       return 1;
+}
+
 /*
  * Set up mandatory non-version specific NFS mount options.
  *
@@ -274,10 +328,8 @@ static int nfs_validate_options(struct nfsmount_info *mi)
        if (!nfs_name_to_address(mi->hostname, sap, &mi->salen))
                return 0;
 
-       if (!nfs_nfs_version(mi->options, &mi->version))
+       if (!nfs_set_version(mi))
                return 0;
-       if (strncmp(mi->type, "nfs4", 4) == 0)
-               mi->version = 4;
 
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
@@ -558,6 +610,25 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi)
                return result;
        }
 
+       if (mi->version == 0) {
+               if (po_contains(options, "mounthost") ||
+                       po_contains(options, "mountaddr") ||
+                       po_contains(options, "mountvers") ||
+                       po_contains(options, "mountproto")) {
+               /*
+                * Since these mountd options are set assume version 3
+                * is wanted so error out with EPROTONOSUPPORT so the
+                * protocol negation starts with v3.
+                */
+                       errno = EPROTONOSUPPORT;
+                       goto out_fail;
+               }
+               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;
@@ -568,7 +639,7 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi)
         */
        if (po_join(options, mi->extra_opts) == PO_FAILED) {
                errno = ENOMEM;
-               return 0;
+               goto out_fail;
        }
 
        result = nfs_sys_mount(mi, options);
@@ -590,6 +661,19 @@ 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) {
+                               /* 
+                                * To deal with legacy Linux servers that don't
+                                * automatically export a pseudo root, retry
+                                * ENOENT errors using version 3
+                                */
+                               if (errno != ENOENT)
+                                       break;
+                       }
+               }
        case 2:
        case 3:
                result = nfs_try_mount_v3v2(mi);