diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-10-13 13:01:51 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-10-14 10:26:59 -0400 |
| commit | 17962b82afb68ca8e6b0d3f432d36c6c7c4980ea (patch) | |
| tree | 48f5b5536631a0ee539c8b382716d5be0ea6b63a /utils/mount | |
| parent | 73c61fa5cd114fa6eae0e095724ed63aa66a4a6b (diff) | |
| download | nfs-utils-17962b82afb68ca8e6b0d3f432d36c6c7c4980ea.tar.gz nfs-utils-17962b82afb68ca8e6b0d3f432d36c6c7c4980ea.tar.xz nfs-utils-17962b82afb68ca8e6b0d3f432d36c6c7c4980ea.zip | |
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>
Diffstat (limited to 'utils/mount')
| -rw-r--r-- | utils/mount/network.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; } /* |