Commit be630b91 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker

SUNRPC: xprt_retransmit() displays the the NULL procedure incorrectly

Currently:

  xprt_retransmit:      task:11@1 xid=0x55a7ffac nfsv4 (null) ntrans=2

should be:

  xprt_retransmit:      task:11@1 xid=0x55a7ffac nfsv4 NULL ntrans=2
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent f9d091cf
...@@ -1063,8 +1063,7 @@ TRACE_EVENT(xprt_retransmit, ...@@ -1063,8 +1063,7 @@ TRACE_EVENT(xprt_retransmit,
__field(int, version) __field(int, version)
__string(progname, __string(progname,
rqst->rq_task->tk_client->cl_program->name) rqst->rq_task->tk_client->cl_program->name)
__string(procedure, __string(procname, rpc_proc_name(rqst->rq_task))
rqst->rq_task->tk_msg.rpc_proc->p_name)
), ),
TP_fast_assign( TP_fast_assign(
...@@ -1078,14 +1077,15 @@ TRACE_EVENT(xprt_retransmit, ...@@ -1078,14 +1077,15 @@ TRACE_EVENT(xprt_retransmit,
__assign_str(progname, __assign_str(progname,
task->tk_client->cl_program->name); task->tk_client->cl_program->name);
__entry->version = task->tk_client->cl_vers; __entry->version = task->tk_client->cl_vers;
__assign_str(procedure, task->tk_msg.rpc_proc->p_name); __assign_str(procname, rpc_proc_name(task));
), ),
TP_printk( TP_printk(
"task:%u@%u xid=0x%08x %sv%d %s ntrans=%d", "task:%u@%u xid=0x%08x %sv%d %s ntrans=%d",
__entry->task_id, __entry->client_id, __entry->xid, __entry->task_id, __entry->client_id, __entry->xid,
__get_str(progname), __entry->version, __get_str(procedure), __get_str(progname), __entry->version, __get_str(procname),
__entry->ntrans) __entry->ntrans
)
); );
TRACE_EVENT(xprt_ping, TRACE_EVENT(xprt_ping,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment