Commit 45cb7955 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Clean up svc_deferred_class trace events 



Replace the temporary fix from commit 4d500445 ("SUNRPC: Fix the
svc_deferred_event trace class") with the use of __sockaddr and
friends, which is the preferred solution (but only available in 5.18
and newer).

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 91e23b1c

include/trace/events/sunrpc.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -2015,19 +2015,18 @@ DECLARE_EVENT_CLASS(svc_deferred_event, 
	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__field(const void *, dr)

		__field(const void *, dr)

		__field(u32, xid)

		__field(u32, xid)

		__array(__u8, addr, INET6_ADDRSTRLEN + 10)

		__sockaddr(addr, dr->addrlen)

	),

	),





	TP_fast_assign(

	TP_fast_assign(

		__entry->dr = dr;

		__entry->dr = dr;

		__entry->xid = be32_to_cpu(*(__be32 *)(dr->args +

		__entry->xid = be32_to_cpu(*(__be32 *)(dr->args +

						       (dr->xprt_hlen>>2)));

						       (dr->xprt_hlen>>2)));

		snprintf(__entry->addr, sizeof(__entry->addr) - 1,

		__assign_sockaddr(addr, &dr->addr, dr->addrlen);

			 "%pISpc", (struct sockaddr *)&dr->addr);

	),

	),





	TP_printk("addr=%s dr=%p xid=0x%08x", __entry->addr, __entry->dr,

	TP_printk("addr=%pISpc dr=%p xid=0x%08x", __get_sockaddr(addr),

		__entry->xid)

		__entry->dr, __entry->xid)

);

);





#define DEFINE_SVC_DEFERRED_EVENT(name) \

#define DEFINE_SVC_DEFERRED_EVENT(name) \