mount.nfs: Prepare way for "vers=4,rdma" mounts

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 024140082fcf56f65968453ca912158ab73f3668..a8b22ce9a0d14bcd89012360cfac52e7f72913bc 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -302,11 +302,6 @@ static int nfs_set_version(struct nfsmount_info *mi)
 
        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
@@ -490,14 +485,19 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options)
        union nfs_sockaddr mnt_address;
        struct sockaddr *mnt_saddr = &mnt_address.sa;
        socklen_t mnt_salen = sizeof(mnt_address);
+       unsigned long protocol;
        struct pmap mnt_pmap;
        char *option;
 
        /*
-        * Skip option negotiation for proto=rdma mounts.
+        * Version and transport negotiation is not required
+        * and does not work for RDMA mounts.
         */
-       option = po_get(options, "proto");
-       if (option && strcmp(option, "rdma") == 0)
+       if (!nfs_nfs_protocol(options, &protocol)) {
+               errno = EINVAL;
+               return 0;
+       }
+       if (protocol == NFSPROTO_RDMA)
                goto out;
 
        /*