summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-11-18 23:06:34 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-11-18 23:06:34 +0300
commitce228d45942492580968d698b0216d3356d75226 (patch)
treef86887e7b129385f294ff3cd5a806aa636049e51
parentf86fee1845eec29bed735e7120e6993ad8c4e295 (diff)
parentc3213d260a23e263ef85ba21ac68c9e7578020b5 (diff)
downloadlinux-ce228d45942492580968d698b0216d3356d75226.tar.xz
Merge tag 'nfsd-5.10-2' of git://linux-nfs.org/~bfields/linux
Pull nfsd fix from Bruce Fields: "Just one quick fix for a tracing oops" * tag 'nfsd-5.10-2' of git://linux-nfs.org/~bfields/linux: SUNRPC: Fix oops in the rpc_xdr_buf event class
-rw-r--r--include/trace/events/sunrpc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 2477014e3fa6..2a03263b5f9d 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -68,7 +68,8 @@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
TP_fast_assign(
__entry->task_id = task->tk_pid;
- __entry->client_id = task->tk_client->cl_clid;
+ __entry->client_id = task->tk_client ?
+ task->tk_client->cl_clid : -1;
__entry->head_base = xdr->head[0].iov_base;
__entry->head_len = xdr->head[0].iov_len;
__entry->tail_base = xdr->tail[0].iov_base;