mount.nfs: rearchitect mount version/protocol negotiation logic

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 770b5b515c494d135966497ad27ba7c73ccea7c8..680156981f8cd131e01a7cb4a674883af10374b4 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -87,8 +87,6 @@ struct nfsmount_info {
        int                     flags,          /* MS_ flags */
                                fake,           /* actually do the mount? */
                                child;          /* forked bg child? */
-
-       sa_family_t             family;         /* supported address family */
 };
 
 /*
@@ -198,8 +196,7 @@ static int nfs_append_clientaddr_option(const struct sockaddr *sap,
  * Resolve the 'mounthost=' hostname and append a new option using
  * the resulting address.
  */
-static int nfs_fix_mounthost_option(const sa_family_t family,
-                                   struct mount_options *options)
+static int nfs_fix_mounthost_option(struct mount_options *options)
 {
        struct sockaddr_storage dummy;
        struct sockaddr *sap = (struct sockaddr *)&dummy;
@@ -210,7 +207,7 @@ static int nfs_fix_mounthost_option(const sa_family_t family,
        if (!mounthost)
                return 1;
 
-       if (!nfs_name_to_address(mounthost, family, sap, &salen)) {
+       if (!nfs_name_to_address(mounthost, sap, &salen)) {
                nfs_error(_("%s: unable to determine mount server's address"),
                                progname);
                return 0;
@@ -270,14 +267,14 @@ static int nfs_validate_options(struct nfsmount_info *mi)
        if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
                return 0;
 
-       if (!nfs_name_to_address(mi->hostname, mi->family, sap, &salen))
+       if (!nfs_name_to_address(mi->hostname, sap, &salen))
                return 0;
 
        if (strncmp(mi->type, "nfs4", 4) == 0) {
                if (!nfs_append_clientaddr_option(sap, salen, mi->options))
                        return 0;
        } else {
-               if (!nfs_fix_mounthost_option(mi->family, mi->options))
+               if (!nfs_fix_mounthost_option(mi->options))
                        return 0;
                if (!mi->fake && !nfs_verify_lock_option(mi->options))
                        return 0;
@@ -331,9 +328,10 @@ static int nfs_extract_server_addresses(struct mount_options *options,
                return 0;
 
        option = po_get(options, "mountaddr");
-       if (option == NULL)
+       if (option == NULL) {
                memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
-       else if (!nfs_string_to_sockaddr(option, strlen(option),
+               *mnt_salen = *nfs_salen;
+       } else if (!nfs_string_to_sockaddr(option, strlen(option),
                                                mnt_saddr, mnt_salen))
                return 0;
 
@@ -439,6 +437,7 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
        struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
        socklen_t mnt_salen;
        struct pmap mnt_pmap;
+       char *option;
 
        options = po_split(str);
        if (!options) {
@@ -446,20 +445,39 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
                return NULL;
        }
 
+       /*
+        * Skip option negotiation for proto=rdma mounts.
+        */
+       option = po_get(options, "proto");
+       if (option && strcmp(option, "rdma") == 0)
+               goto out;
+
+       /*
+        * Extract just the options needed to contact server.
+        * Bail now if any of these have bad values.
+        */
        if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen,
                                                mnt_saddr, &mnt_salen)) {
                errno = EINVAL;
                goto err;
        }
+       if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
+               errno = EINVAL;
+               goto err;
+       }
 
-       nfs_options2pmap(options, &nfs_pmap, &mnt_pmap);
-
-       /* The kernel NFS client doesn't support changing the RPC program
-        * number for these services, so reset these fields before probing
-        * the server's ports.  */
+       /*
+        * The kernel NFS client doesn't support changing the RPC
+        * program number for these services, so force the value of
+        * these fields before probing the server's ports.
+        */
        nfs_pmap.pm_prog = NFS_PROGRAM;
        mnt_pmap.pm_prog = MOUNTPROG;
 
+       /*
+        * If the server's rpcbind service isn't available, we can't
+        * negotiate.  Bail now if we can't contact it.
+        */
        if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap,
                                 nfs_saddr, nfs_salen, &nfs_pmap)) {
                errno = ESPIPE;
@@ -471,6 +489,7 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
                goto err;
        }
 
+out:
        errno = 0;
        return options;
 
@@ -531,6 +550,9 @@ static int nfs_retry_nfs23mount(struct nfsmount_info *mi)
                printf(_("%s: text-based options (retry): '%s'\n"),
                        progname, retry_str);
 
+       if (mi->fake)
+               return 1;
+
        if (!nfs_sys_mount(mi, "nfs", retry_str)) {
                po_destroy(retry_options);
                free(retry_str);
@@ -569,19 +591,6 @@ static int nfs_try_nfs23mount(struct nfsmount_info *mi)
                printf(_("%s: text-based options: '%s'\n"),
                        progname, *extra_opts);
 
-       if (mi->fake)
-               return 1;
-
-       if (nfs_sys_mount(mi, "nfs", *extra_opts))
-               return 1;
-
-       /*
-        * The kernel returns EOPNOTSUPP if the RPC bind failed,
-        * and EPROTONOSUPPORT if the version isn't supported.
-        */
-       if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
-               return 0;
-
        return nfs_retry_nfs23mount(mi);
 }
 
@@ -784,11 +793,6 @@ int nfsmount_string(const char *spec, const char *node, const char *type,
                .flags          = flags,
                .fake           = fake,
                .child          = child,
-#ifdef IPV6_SUPPORTED
-               .family         = AF_UNSPEC,    /* either IPv4 or v6 */
-#else
-               .family         = AF_INET,      /* only IPv4 */
-#endif
        };
        int retval = EX_FAIL;