When parsing mount options in nfs_options2pmap(), treat the value of
proto= (and mountproto=) as a netid by looking it up in local
netconfig and protocol databases to convert it to a protocol number.
If TI-RPC is not available, the traditional behavior is preserved.
The meaning of the "udp" and "tcp" mount options is not affected by
this change.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
int
nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
{
int
nfs_nfs_protocol(struct mount_options *options, unsigned long *protocol)
{
char *option;
switch (po_rightmost(options, nfs_transport_opttbl)) {
char *option;
switch (po_rightmost(options, nfs_transport_opttbl)) {
return 1;
case 2: /* proto */
option = po_get(options, "proto");
return 1;
case 2: /* proto */
option = po_get(options, "proto");
- if (option) {
- if (strcmp(option, "tcp") == 0) {
- *protocol = IPPROTO_TCP;
- return 1;
- }
- if (strcmp(option, "udp") == 0) {
- *protocol = IPPROTO_UDP;
- return 1;
- }
- return 0;
- }
+ if (option != NULL)
+ return nfs_get_proto(option, &family, protocol);
static int
nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
{
static int
nfs_mount_protocol(struct mount_options *options, unsigned long *protocol)
{
char *option;
option = po_get(options, "mountproto");
char *option;
option = po_get(options, "mountproto");
- if (option) {
- if (strcmp(option, "tcp") == 0) {
- *protocol = IPPROTO_TCP;
- return 1;
- }
- if (strcmp(option, "udp") == 0) {
- *protocol = IPPROTO_UDP;
- return 1;
- }
- return 0;
- }
+ if (option != NULL)
+ return nfs_get_proto(option, &family, protocol);
/*
* MNT transport protocol wasn't specified. If the NFS
/*
* MNT transport protocol wasn't specified. If the NFS