On Sep 2, 2010, at 4:00 PM, Steve Dickson wrote:
> The mounting code that process RMDA mounts is broken in a few places
>
> First with '-o proto=rdma' was broken because nfs_get_proto()
> did not how to convert a netid of 'rdma' in to a AF_INET
> address family.
>
> Secondly, '-o rdma' was broken because po_get() was being using
> to detect the existence of 'rdma' in the options. With '-o rdma'
> there is no value associated with that option so po_get()
> was always return NULL.
Looking at nfs(5), "rdma" as a stand-alone option isn't documented. Only "proto=rdma" appears to be mentioned. Thus I would argue that this is already behaving correctly.
Are you proposing to add support for "-o rdma" ? If so what would that mean?
> This patch address both those problems.
>
> Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
> ---
> support/nfs/getport.c | 8 ++++++++
> utils/mount/stropts.c | 31 ++++++++++++++++++++++---------
> 2 files changed, 30 insertions(+), 9 deletions(-)
>
> diff --git a/support/nfs/getport.c b/support/nfs/getport.c
> index c930539..b4c2f8f 100644
> --- a/support/nfs/getport.c
> +++ b/support/nfs/getport.c
> @@ -216,6 +216,10 @@ nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol)
> struct netconfig *nconf;
> struct protoent *proto;
>
> + if (strcasecmp(netid, "rdma") == 0) {
> + *family = AF_INET;
> + return 1;
> + }
> nconf = getnetconfigent(netid);
> if (nconf == NULL)
> return 0;
> @@ -242,6 +246,10 @@ nfs_get_proto(const char *netid, sa_family_t *family, unsigned long *protocol)
> {
> struct protoent *proto;
>
> + if (strcasecmp(netid, "rdma") == 0) {
> + *family = AF_INET;
> + return 1;
> + }
> proto = getprotobyname(netid);
> if (proto == NULL)
> return 0;
> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
> index 0241400..d688ee8 100644
> --- a/utils/mount/stropts.c
> +++ b/utils/mount/stropts.c
> @@ -98,6 +98,22 @@ struct nfsmount_info {
> child; /* forked bg child? */
> };
>
> +/*
> + * Check the options to see if the transport is RDMA
> + */
> +static int rdma_enabled(struct mount_options *options)
> +{
> + char *option;
> +
> + if (po_contains(options, "rdma"))
> + return 1;
> + option = po_get(options, "proto");
> + if (option && strcmp(option, "rdma") == 0)
> + return 1;
> +
> + return 0;
> +}
> +
> #ifdef MOUNT_CONFIG
> static void nfs_default_version(struct nfsmount_info *mi);
>
> @@ -302,11 +318,8 @@ static int nfs_set_version(struct nfsmount_info *mi)
>
> if (strncmp(mi->type, "nfs4", 4) == 0)
> mi->version = 4;
> - else {
> - char *option = po_get(mi->options, "proto");
> - if (option && strcmp(option, "rdma") == 0)
> - mi->version = 3;
> - }
> + else if (rdma_enabled(mi->options))
> + mi->version = 3;
>
> /*
> * If we still don't know, check for version-specific
> @@ -346,7 +359,9 @@ static int nfs_validate_options(struct nfsmount_info *mi)
> if (!nfs_parse_devname(mi->spec, &mi->hostname, NULL))
> return 0;
>
> - if (!nfs_nfs_proto_family(mi->options, &family))
> + if (rdma_enabled(mi->options))
> + family = AF_INET;
> + else if (!nfs_nfs_proto_family(mi->options, &family))
> return 0;
>
> hint.ai_family = (int)family;
> @@ -491,13 +506,11 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options)
> struct sockaddr *mnt_saddr = &mnt_address.sa;
> socklen_t mnt_salen = sizeof(mnt_address);
> struct pmap mnt_pmap;
> - char *option;
>
> /*
> * Skip option negotiation for proto=rdma mounts.
> */
> - option = po_get(options, "proto");
> - if (option && strcmp(option, "rdma") == 0)
> + if (rdma_enabled(options))
> goto out;
>
> /*
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
chuck[dot]lever[at]oracle[dot]com
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
