diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2018-01-23 17:32:35 +0300 |
|---|---|---|
| committer | Trond Myklebust <trondmy@gmail.com> | 2018-01-23 21:18:11 +0300 |
| commit | 0be283f676a1e7b208db0c992283197ef8b52158 (patch) | |
| tree | 9a11d84498cee0462ee7f212d9fd78057fa58156 /include/trace/events/sunrpc.h | |
| parent | 49686cbbb3ebafe42e63868222f269d8053ead00 (diff) | |
| download | linux-0be283f676a1e7b208db0c992283197ef8b52158.tar.xz | |
SUNRPC: Fix null rpc_clnt dereference in rpc_task_queued tracepoint
Backchannel tasks will not have a reference to the rpc_clnt. Return -1 for
cl_clid in that case.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trondmy@gmail.com>
Diffstat (limited to 'include/trace/events/sunrpc.h')
| -rw-r--r-- | include/trace/events/sunrpc.h | 4 |
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, |