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

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

include/trace/events/sunrpc.h

+5 −5
Original line number Diff line number Diff line
@@ -1063,8 +1063,7 @@ TRACE_EVENT(xprt_retransmit, 
		__field(int, version)

		__string(progname,

			 rqst->rq_task->tk_client->cl_program->name)

		__string(procedure,

			 rqst->rq_task->tk_msg.rpc_proc->p_name)

		__string(procname, rpc_proc_name(rqst->rq_task))

	),



	TP_fast_assign(
@@ -1078,14 +1077,15 @@ TRACE_EVENT(xprt_retransmit, 
		__assign_str(progname,

			     task->tk_client->cl_program->name);

		__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(

		"task:%u@%u xid=0x%08x %sv%d %s ntrans=%d",

		__entry->task_id, __entry->client_id, __entry->xid,

		__get_str(progname), __entry->version, __get_str(procedure),

		__entry->ntrans)

		__get_str(progname), __entry->version, __get_str(procname),

		__entry->ntrans

	)

);



TRACE_EVENT(xprt_ping,