1 files changed, 2 insertions, 2 deletions

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 8c153f68509e..1357ec8973d5 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -175,7 +175,7 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
                 ),
 
         TP_fast_assign(
-                __entry->client_id = clnt->cl_clid;
+                __entry->client_id = clnt ? clnt->cl_clid : -1;
                 __entry->task_id = task->tk_pid;
                 __entry->timeout = task->tk_timeout;
                 __entry->runstate = task->tk_runstate;
@@ -184,7 +184,7 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
                 __assign_str(q_name, rpc_qname(q));
                 ),
 
-        TP_printk("task:%u@%u flags=%4.4x state=%4.4lx status=%d timeout=%lu queue=%s",
+        TP_printk("task:%u@%d flags=%4.4x state=%4.4lx status=%d timeout=%lu queue=%s",
                 __entry->task_id, __entry->client_id,
                 __entry->flags,
                 __entry->runstate,