From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 13 Oct 2010 17:01:51 +0000 (-0400)
Subject: mount.nfs: mountproto does not support RDMA
X-Git-Tag: nfs-utils-1-2-4-rc1~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=17962b82afb68ca8e6b0d3f432d36c6c7c4980ea;p=nfs-utils.git

mount.nfs: mountproto does not support RDMA

Clean up.  Our client does not support the MNT protocol on RDMA.

nfs_mount_protocol() isn't invoked for RDMA mounts (they are shunted
off before nfs_options2pmap() is invoked).  But in case it ever is,
it should return the expected response.

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 1759c1c..5b515c3 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -1521,7 +1521,11 @@ nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
 	 * set @protocol to zero.  The pmap protocol value will
 	 * be filled in later by an rpcbind query in this case.
 	 */
-	return nfs_nfs_protocol(options, protocol);
+	if (!nfs_nfs_protocol(options, protocol))
+		return 0;
+	if (*protocol == NFSPROTO_RDMA)
+		*protocol = IPPROTO_TCP;
+	return 1;
 }
 
 /*