Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / include / trace / events / sunrpc.h

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 4a2abf9daa465b6dd563c5e793df1ed42cd30740..ac05ed06a0714eff56e5d01e612917286369f020 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1331,18 +1331,18 @@ TRACE_EVENT(xs_stream_read_data,
                __field(ssize_t, err)
                __field(size_t, total)
                __string(addr, xprt ? xprt->address_strings[RPC_DISPLAY_ADDR] :
-                               "(null)")
+                               EVENT_NULL_STR)
                __string(port, xprt ? xprt->address_strings[RPC_DISPLAY_PORT] :
-                               "(null)")
+                               EVENT_NULL_STR)
        ),
 
        TP_fast_assign(
                __entry->err = err;
                __entry->total = total;
                __assign_str(addr, xprt ?
-                       xprt->address_strings[RPC_DISPLAY_ADDR] : "(null)");
+                       xprt->address_strings[RPC_DISPLAY_ADDR] : EVENT_NULL_STR);
                __assign_str(port, xprt ?
-                       xprt->address_strings[RPC_DISPLAY_PORT] : "(null)");
+                       xprt->address_strings[RPC_DISPLAY_PORT] : EVENT_NULL_STR);
        ),
 
        TP_printk("peer=[%s]:%s err=%zd total=%zu", __get_str(addr),
@@ -1787,7 +1787,7 @@ TRACE_EVENT(svc_process,
                __string(service, name)
                __string(procedure, svc_proc_name(rqst))
                __string(addr, rqst->rq_xprt ?
-                        rqst->rq_xprt->xpt_remotebuf : "(null)")
+                        rqst->rq_xprt->xpt_remotebuf : EVENT_NULL_STR)
        ),
 
        TP_fast_assign(
@@ -1797,7 +1797,7 @@ TRACE_EVENT(svc_process,
                __assign_str(service, name);
                __assign_str(procedure, svc_proc_name(rqst));
                __assign_str(addr, rqst->rq_xprt ?
-                            rqst->rq_xprt->xpt_remotebuf : "(null)");
+                            rqst->rq_xprt->xpt_remotebuf : EVENT_NULL_STR);
        ),
 
        TP_printk("addr=%s xid=0x%08x service=%s vers=%u proc=%s",