aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
author\"Talpey, Thomas\ <Thomas.Talpey@netapp.com>2007-09-10 13:48:47 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:17:55 -0400
commit56928edd5afb51d684c38c0bed56594e93ffe4c7 (patch)
treef4b48628286f923c68727feba78b2b51a6502352 /fs/nfs
parent0896a725a1c5fdc8773a4d1ab0b73059507f5925 (diff)
NFS - print accurate transport protocol
Use the per-transport strings to display the transport protocol accurately. Signed-off-by: Tom Talpey <tmt@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b47e87e6c406..347c36341e53 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -432,8 +432,6 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
432 }; 432 };
433 const struct proc_nfs_info *nfs_infop; 433 const struct proc_nfs_info *nfs_infop;
434 struct nfs_client *clp = nfss->nfs_client; 434 struct nfs_client *clp = nfss->nfs_client;
435 char buf[12];
436 const char *proto;
437 435
438 seq_printf(m, ",vers=%d", clp->rpc_ops->version); 436 seq_printf(m, ",vers=%d", clp->rpc_ops->version);
439 seq_printf(m, ",rsize=%d", nfss->rsize); 437 seq_printf(m, ",rsize=%d", nfss->rsize);
@@ -452,18 +450,8 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
452 else 450 else
453 seq_puts(m, nfs_infop->nostr); 451 seq_puts(m, nfs_infop->nostr);
454 } 452 }
455 switch (nfss->client->cl_xprt->prot) { 453 seq_printf(m, ",proto=%s",
456 case IPPROTO_TCP: 454 rpc_peeraddr2str(nfss->client, RPC_DISPLAY_PROTO));
457 proto = "tcp";
458 break;
459 case IPPROTO_UDP:
460 proto = "udp";
461 break;
462 default:
463 snprintf(buf, sizeof(buf), "%u", nfss->client->cl_xprt->prot);
464 proto = buf;
465 }
466 seq_printf(m, ",proto=%s", proto);
467 seq_printf(m, ",timeo=%lu", 10U * clp->retrans_timeo / HZ); 455 seq_printf(m, ",timeo=%lu", 10U * clp->retrans_timeo / HZ);
468 seq_printf(m, ",retrans=%u", clp->retrans_count); 456 seq_printf(m, ",retrans=%u", clp->retrans_count);
469 seq_printf(m, ",sec=%s", nfs_pseudoflavour_to_name(nfss->client->cl_auth->au_flavor)); 457 seq_printf(m, ",sec=%s", nfs_pseudoflavour_to_name(nfss->client->cl_auth->au_flavor));