From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 24 Jan 2022 16:31:45 +0000 (-0500)
Subject: SUNRPC: Improve sockaddr handling in the svc_xprt_create_error trace point
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=26ce14e77a827fd73a650cffea4db7ddcc62ebc4;p=linux.git

SUNRPC: Improve sockaddr handling in the svc_xprt_create_error trace point

Clean up: Use the new __sockaddr field to record the socket address.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 29982d60b68ab..39ed91dca5aba 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1774,18 +1774,18 @@ TRACE_EVENT(svc_xprt_create_err,
 		__field(long, error)
 		__string(program, program)
 		__string(protocol, protocol)
-		__array(unsigned char, addr, sizeof(struct sockaddr_in6))
+		__sockaddr(addr, salen)
 	),
 
 	TP_fast_assign(
 		__entry->error = PTR_ERR(xprt);
 		__assign_str(program, program);
 		__assign_str(protocol, protocol);
-		memcpy(__entry->addr, sap, min(salen, sizeof(__entry->addr)));
+		__assign_sockaddr(addr, sap, salen);
 	),
 
 	TP_printk("addr=%pISpc program=%s protocol=%s error=%ld",
-		__entry->addr, __get_str(program), __get_str(protocol),
+		__get_sockaddr(addr), __get_str(program), __get_str(protocol),
 		__entry->error)
 );