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

At some point, when the kernel starts to support "vers=4,rdma" mounts,
we will want the mount.nfs command to pass "vers=4,rdma" mounts
instead of rejecting them.

Assuming that the kernel will reject these today with EPROTONOSUPPORT,
that would cause the version fallback logic to go to "vers=3,rdma"
automatically.  So the extra check we have now is not needed anyway.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 9695c739c4f53844a65119b3dd049faca2b304ee..a8b22ce9a0d14bcd89012360cfac52e7f72913bc 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -302,13 +302,6 @@ static int nfs_set_version(struct nfsmount_info *mi)
 
        if (strncmp(mi->type, "nfs4", 4) == 0)
                mi->version = 4;
-       else {
-               unsigned long protocol;
-               if (!nfs_nfs_protocol(mi->options, &protocol))
-                       return 0;
-               if (protocol == NFSPROTO_RDMA)
-                       mi->version = 3;
-       }
 
        /*
         * If we still don't know, check for version-specific