In rpc_show_tasks(), display the program name, version number, and procedure name as human-readable variable-length text fields rather than columnar numbers. Sample output: -pid- flgs status -client- --rqstp- -timeout -action- ---ops-- 14470 0001 0 ee83eaf0 f79a2060 60000 f8cefa00 f8eaa764 nfs3 WRITE wq:xprt_pending 2970 0001 0 ee83eaf0 f79a2060 60000 f8cefa00 f8eaa77c nfs3 COMMIT wq:xprt_pending 12468 0080 0 ee83eaf0 f79a2060 0 f8cefa00 f8d03634 nfs3 SETATTR 40513 0001 0 ee83eaf0 f79a2060 0 f8cefa00 f8eaa6c8 nfs3 READ Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> --- net/sunrpc/clnt.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 15c0f5b..6f94a70 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1519,29 +1519,26 @@ EXPORT_SYMBOL_GPL(rpc_call_null); #ifdef RPC_DEBUG static void rpc_show_header(void) { - printk(KERN_INFO "-pid- proc flgs status -client- -prog- --rqstp- " - "-timeout -rpcwait -action- ---ops--\n"); + printk(KERN_INFO "-pid- flgs status -client- --rqstp- " + "-timeout -action- ---ops--\n"); } static void rpc_show_task(const struct rpc_clnt *clnt, const struct rpc_task *task) { - const char *rpc_waitq = "none"; - int proc = -1; + printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %8p %s%u", + task->tk_pid, task->tk_flags, task->tk_status, + clnt, task->tk_rqstp, task->tk_timeout, + task->tk_action, task->tk_ops, clnt->cl_protname, + clnt->cl_vers); if (task->tk_msg.rpc_proc) - proc = task->tk_msg.rpc_proc->p_proc; + printk(KERN_CONT " %s", task->tk_msg.rpc_proc->p_name); if (RPC_IS_QUEUED(task)) - rpc_waitq = rpc_qname(task->tk_waitqueue); - - printk(KERN_INFO "%5u %04d %04x %6d %8p %6d %8p %8ld %8s %8p %8p\n", - task->tk_pid, proc, - task->tk_flags, task->tk_status, - clnt, clnt->cl_prog, - task->tk_rqstp, task->tk_timeout, - rpc_waitq, - task->tk_action, task->tk_ops); + printk(KERN_CONT " wq:%s", rpc_qname(task->tk_waitqueue)); + + printk(KERN_CONT "\n"); } void rpc_show_tasks(void) -- 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