mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-26 18:43:33 -05:00
Code Activity

NFS: tidy up nfs_show_mountd_netid

Browse source 
This function is a bit clumsy, incorrectly producing
",mountproto=" if mountd_protocol is 0 and !showdefaults,
and duplicating the code for reporting "auto".

Tidy it up so that it only makes a single seq_printf() call,
and more obviously does the right thing.

Fixes: ee671b016f ("NFS: convert proto= option to use netids rather than a protoname")
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
NeilBrown 2017-01-13 11:04:27 +11:00 • committed by Anna Schumaker
parent 4c3ffd058c
commit 6f6e3c09c0
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/nfs/super.c
View file

@ -531,39 +531,32 @@ static void nfs_show_mountd_netid(struct seq_file *m, struct nfs_server *nfss,
int showdefaults) int showdefaults)
{ {
struct sockaddr *sap = (struct sockaddr *) &nfss->mountd_address; struct sockaddr *sap = (struct sockaddr *) &nfss->mountd_address;
char *proto = NULL;
seq_printf(m, ",mountproto=");
switch (sap->sa_family) { switch (sap->sa_family) {
case AF_INET: case AF_INET:
switch (nfss->mountd_protocol) { switch (nfss->mountd_protocol) {
case IPPROTO_UDP: case IPPROTO_UDP:
seq_printf(m, RPCBIND_NETID_UDP); proto = RPCBIND_NETID_UDP;
break; break;
case IPPROTO_TCP: case IPPROTO_TCP:
seq_printf(m, RPCBIND_NETID_TCP); proto = RPCBIND_NETID_TCP;
break; break;
default:
if (showdefaults)
seq_printf(m, "auto");
} }
break; break;
case AF_INET6: case AF_INET6:
switch (nfss->mountd_protocol) { switch (nfss->mountd_protocol) {
case IPPROTO_UDP: case IPPROTO_UDP:
seq_printf(m, RPCBIND_NETID_UDP6); proto = RPCBIND_NETID_UDP6;
break; break;
case IPPROTO_TCP: case IPPROTO_TCP:
seq_printf(m, RPCBIND_NETID_TCP6); proto = RPCBIND_NETID_TCP6;
break; break;
default:
if (showdefaults)
seq_printf(m, "auto");
} }
break; break;
default:
if (showdefaults)
seq_printf(m, "auto");
} }
if (proto || showdefaults)
seq_printf(m, ",mountproto=%s", proto ?: "auto");
} }
static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss, static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,