Skip to content

Commit 3f8f25c

Browse files
committed
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 <[email protected]>
1 parent ba6cc97 commit 3f8f25c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

include/trace/events/rpcrdma.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,7 +1716,7 @@ TRACE_EVENT(svcrdma_send_pullup,
17161716
TP_printk("len=%u", __entry->len)
17171717
);
17181718

1719-
TRACE_EVENT(svcrdma_send_failed,
1719+
TRACE_EVENT(svcrdma_send_err,
17201720
TP_PROTO(
17211721
const struct svc_rqst *rqst,
17221722
int status
@@ -1727,19 +1727,16 @@ TRACE_EVENT(svcrdma_send_failed,
17271727
TP_STRUCT__entry(
17281728
__field(int, status)
17291729
__field(u32, xid)
1730-
__field(const void *, xprt)
17311730
__string(addr, rqst->rq_xprt->xpt_remotebuf)
17321731
),
17331732

17341733
TP_fast_assign(
17351734
__entry->status = status;
17361735
__entry->xid = __be32_to_cpu(rqst->rq_xid);
1737-
__entry->xprt = rqst->rq_xprt;
17381736
__assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
17391737
),
17401738

1741-
TP_printk("xprt=%p addr=%s xid=0x%08x status=%d",
1742-
__entry->xprt, __get_str(addr),
1739+
TP_printk("addr=%s xid=0x%08x status=%d", __get_str(addr),
17431740
__entry->xid, __entry->status
17441741
)
17451742
);

net/sunrpc/xprtrdma/svc_rdma_sendto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
971971
err1:
972972
svc_rdma_send_ctxt_put(rdma, sctxt);
973973
err0:
974-
trace_svcrdma_send_failed(rqstp, ret);
974+
trace_svcrdma_send_err(rqstp, ret);
975975
set_bit(XPT_CLOSE, &xprt->xpt_flags);
976976
return -ENOTCONN;
977977
}

0 commit comments

Comments
 (0)