svcrdma: Clean up trace_svcrdma_send_failed() tracepoint

- Use the _err naming convention instead
- Remove display of kernel memory address of the controlling xprt

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

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index 0f05a6e2b9cb35a45db4cedc0fb2e3eaba964209..0eff80dee06661d1da7c7adba03b26b5503f992c 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1716,7 +1716,7 @@ TRACE_EVENT(svcrdma_send_pullup,
        TP_printk("len=%u", __entry->len)
 );
 
-TRACE_EVENT(svcrdma_send_failed,
+TRACE_EVENT(svcrdma_send_err,
        TP_PROTO(
                const struct svc_rqst *rqst,
                int status
@@ -1727,19 +1727,16 @@ TRACE_EVENT(svcrdma_send_failed,
        TP_STRUCT__entry(
                __field(int, status)
                __field(u32, xid)
-               __field(const void *, xprt)
                __string(addr, rqst->rq_xprt->xpt_remotebuf)
        ),
 
        TP_fast_assign(
                __entry->status = status;
                __entry->xid = __be32_to_cpu(rqst->rq_xid);
-               __entry->xprt = rqst->rq_xprt;
                __assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
        ),
 
-       TP_printk("xprt=%p addr=%s xid=0x%08x status=%d",
-               __entry->xprt, __get_str(addr),
+       TP_printk("addr=%s xid=0x%08x status=%d", __get_str(addr),
                __entry->xid, __entry->status
        )
 );

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 57041298fe4f4c8b4911981c8a26302136eb99c6..f985f548346a29d435be5c1fdc11b32ceb470288 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -971,7 +971,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
  err1:
        svc_rdma_send_ctxt_put(rdma, sctxt);
  err0:
-       trace_svcrdma_send_failed(rqstp, ret);
+       trace_svcrdma_send_err(rqstp, ret);
        set_bit(XPT_CLOSE, &xprt->xpt_flags);
        return -ENOTCONN;
 }