From: Chuck Lever Date: Wed, 8 Sep 2010 17:28:24 +0000 (-0400) Subject: mount.nfs: Prepare way for "vers=4,rdma" mounts X-Git-Tag: nfs-utils-1-2-3-rc6~18 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=911630538580cdaaee1c37cdf1a8b35b8ed6b23f;p=nfs-utils.git 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 Signed-off-by: Steve Dickson --- diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 9695c73..a8b22ce 100644 --- 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