From: Chuck Lever <chuck.lever@oracle.com>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 13/15] mount.nfs: mountproto does not support RDMA
Date: Sun, 10 Oct 2010 20:06:10 -0400 [thread overview]
Message-ID: <20101011000610.6667.50921.stgit@ellison.1015granger.net> (raw)
In-Reply-To: <20101010234836.6667.4057.stgit@ellison.1015granger.net>
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>
---
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 62973cf..1ebaced 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;
}
/*
next prev parent reply other threads:[~2010-10-11 0:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 0:04 [PATCH 00/15] Fixes for nfs-utils-1.2.4 Chuck Lever
2010-10-11 0:04 ` [PATCH 01/15] mountd: Clear mountd registrations at start up Chuck Lever
2010-10-13 14:55 ` Steve Dickson
2010-10-13 15:12 ` Steve Dickson
2010-10-13 20:12 ` Chuck Lever
2010-10-13 20:39 ` Steve Dickson
2010-10-14 13:21 ` Steve Dickson
2010-10-11 0:04 ` [PATCH 02/15] libnfs.a: Allow multiple RPC listeners to share listener port number Chuck Lever
2010-10-11 0:20 ` Jim Rees
2010-10-11 13:22 ` Steve Dickson
2010-10-11 16:04 ` Chuck Lever
2010-10-11 20:00 ` Jim Rees
[not found] ` <20101011200017.GA2451-8f4Pc2RrbJmHXe+LvDLADg@public.gmane.org>
2010-10-13 14:17 ` Steve Dickson
2010-10-11 0:04 ` [PATCH 03/15] export: Ensure that we free struct exportent->e_uuid Chuck Lever
2010-10-11 0:04 ` [PATCH 04/15] mount.nfs: Eliminate compiler warnings Chuck Lever
2010-10-11 13:32 ` Steve Dickson
2010-10-11 16:18 ` Chuck Lever
2010-10-11 16:45 ` Steve Dickson
2010-10-11 0:04 ` [PATCH 05/15] mount.nfs: Eliminate compiler warning in utils/mount/mount.c Chuck Lever
2010-10-11 0:05 ` [PATCH 06/15] mount.nfs: Eliminate compiler warnings in utils/mount/version.h Chuck Lever
2010-10-11 0:05 ` [PATCH 07/15] mount.nfs: Eliminate compiler warning in utils/mount/mount.c Chuck Lever
2010-10-11 0:05 ` [PATCH 08/15] mount.nfs: Eliminate compiler warnings " Chuck Lever
2010-10-11 0:05 ` [PATCH 09/15] mount.nfs: Eliminate compiler warning in utils/mount/nfsumount.c Chuck Lever
2010-10-11 0:05 ` [PATCH 10/15] " Chuck Lever
2010-10-11 0:05 ` [PATCH 11/15] mount.nfs: Eliminate compiler warning in utils/mount/parse_opt.c Chuck Lever
2010-10-11 0:06 ` [PATCH 12/15] mount.nfs: Eliminate compiler warnings in utils/mount/network.c Chuck Lever
2010-10-11 0:06 ` Chuck Lever [this message]
2010-10-11 0:06 ` [PATCH 14/15] umount.nfs: Distinguish between nfs4 and nfs mounts Chuck Lever
2010-10-11 0:06 ` [PATCH 15/15] mount.nfs: don't show "remount" flag in /etc/mtab Chuck Lever
2010-10-11 4:16 ` [PATCH 00/15] Fixes for nfs-utils-1.2.4 Neil Brown
2010-10-11 15:18 ` Chuck Lever
[not found] ` <20101010234836.6667.4057.stgit-ewv44WTpT0t9HhUboXbp9zCvJB+x5qRC@public.gmane.org>
2010-10-14 14:37 ` Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101011000610.6667.50921.stgit@ellison.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).