SUNRPC: Improve sockaddr handling in the svc_xprt_create_error trace point
authorChuck Lever <chuck.lever@oracle.com>
Mon, 24 Jan 2022 16:31:45 +0000 (11:31 -0500)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 28 Feb 2022 15:26:39 +0000 (10:26 -0500)
Clean up: Use the new __sockaddr field to record the socket address.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
include/trace/events/sunrpc.h

index 29982d60b68ab271729d17190d175559a50eeb85..39ed91dca5aba201077547475d13b359b60ab7bb 100644 (file)
@@ -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)
 );