diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:32 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:35 +0300 |
| commit | 85595a78a523118d962c625b21dce270210244a9 (patch) | |
| tree | 0c1c76226e44cc5e9b1139a706ccd6b717d88155 /include/trace | |
| parent | fc8ba762618d0f80130ea68853692c52402d0b36 (diff) | |
| parent | 81d8d30c35edf29c5c70186ccb14dac4a5ca38a8 (diff) | |
| download | linux-85595a78a523118d962c625b21dce270210244a9.tar.xz | |
Merge tag 'v5.15.35' into dev-5.15
This is the 5.15.35 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/sunrpc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 7c48613c1830..6bcb8c7a3175 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -1924,17 +1924,18 @@ DECLARE_EVENT_CLASS(svc_deferred_event, TP_STRUCT__entry( __field(const void *, dr) __field(u32, xid) - __string(addr, dr->xprt->xpt_remotebuf) + __array(__u8, addr, INET6_ADDRSTRLEN + 10) ), TP_fast_assign( __entry->dr = dr; __entry->xid = be32_to_cpu(*(__be32 *)(dr->args + (dr->xprt_hlen>>2))); - __assign_str(addr, dr->xprt->xpt_remotebuf); + snprintf(__entry->addr, sizeof(__entry->addr) - 1, + "%pISpc", (struct sockaddr *)&dr->addr); ), - TP_printk("addr=%s dr=%p xid=0x%08x", __get_str(addr), __entry->dr, + TP_printk("addr=%s dr=%p xid=0x%08x", __entry->addr, __entry->dr, __entry->xid) ); |