Introduce verbose parameter to utility routine in order to reduce output
verbosity. This is a preliminary patch to add rpc_status entry in nfsd
debug filesystem in order to dump pending RPC requests debugging
information.
Reviewed-by: NeilBrown <neilb@xxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
---
include/linux/sunrpc/svc_xprt.h | 12 ++++++------
net/sunrpc/svc_xprt.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index fa55d12dc765..2615cc535199 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -213,21 +213,21 @@ static inline unsigned short svc_xprt_remote_port(const struct svc_xprt *xprt)
}
static inline char *__svc_print_addr(const struct sockaddr *addr,
- char *buf, const size_t len)
+ char *buf, const size_t len,
+ bool verbose)
{
const struct sockaddr_in *sin = (const struct sockaddr_in *)addr;
const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)addr;
switch (addr->sa_family) {
case AF_INET:
- snprintf(buf, len, "%pI4, port=%u", &sin->sin_addr,
- ntohs(sin->sin_port));
+ snprintf(buf, len, "%pI4%s%hu", &sin->sin_addr,
+ verbose ? ", port=" : " ", ntohs(sin->sin_port));
break;
case AF_INET6:
- snprintf(buf, len, "%pI6, port=%u",
- &sin6->sin6_addr,
- ntohs(sin6->sin6_port));
+ snprintf(buf, len, "%pI6%s%hu", &sin6->sin6_addr,
+ verbose ? ", port=" : " ", ntohs(sin6->sin6_port));
break;
default:
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index d3280ae70e36..940be13d02b0 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -386,7 +386,7 @@ EXPORT_SYMBOL_GPL(svc_xprt_copy_addrs);
*/
char *svc_print_addr(struct svc_rqst *rqstp, char *buf, size_t len)
{
- return __svc_print_addr(svc_addr(rqstp), buf, len);
+ return __svc_print_addr(svc_addr(rqstp), buf, len, true);
}
EXPORT_SYMBOL_GPL(svc_print_addr);
--
2.41.0
