summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-09-08 13:28:24 -0400
committerSteve Dickson <steved@redhat.com>2010-09-09 10:38:48 -0400
commit911630538580cdaaee1c37cdf1a8b35b8ed6b23f (patch)
tree59c3dacde0b3a5e18e6eeb3f6ad12c1800c4618f /utils
parentf99d1b8e8768ab96b51bed52f21a626ac9a4797f (diff)
downloadnfs-utils-911630538580cdaaee1c37cdf1a8b35b8ed6b23f.tar.gz
nfs-utils-911630538580cdaaee1c37cdf1a8b35b8ed6b23f.tar.xz
nfs-utils-911630538580cdaaee1c37cdf1a8b35b8ed6b23f.zip
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>
Diffstat (limited to 'utils')
-rw-r--r--utils/mount/stropts.c7
1 files changed, 0 insertions, 7 deletions
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