svcrdma: Clean up trace_svcrdma_send_failed() tracepoint

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

Chuck Lever committed 6 years ago

Commit 3f8f25c1 parent ba6cc972 files · +3 −6Browse files

Unified · Split

2 files

@@ -1716,7 +1716,7 @@ TRACE_EVENT(svcrdma_send_pullup, · 1715 unmodified lines
1716	1716	TP_printk("len=%u", __entry->len)
1717	1717	);
1718	1718
1719		−TRACE_EVENT(svcrdma_send_failed,
	1719	+TRACE_EVENT(svcrdma_send_err,
1720	1720	TP_PROTO(
1721	1721	const struct svc_rqst *rqst,
1722	1722	int status
@@ -1727,19 +1727,16 @@ TRACE_EVENT(svcrdma_send_failed, · 4 unmodified lines
1727	1727	TP_STRUCT__entry(
1728	1728	__field(int, status)
1729	1729	__field(u32, xid)
1730		− __field(const void *, xprt)
1731	1730	__string(addr, rqst->rq_xprt->xpt_remotebuf)
1732	1731	),
1733	1732
1734	1733	TP_fast_assign(
1735	1734	__entry->status = status;
1736	1735	__entry->xid = __be32_to_cpu(rqst->rq_xid);
1737		− __entry->xprt = rqst->rq_xprt;
1738	1736	__assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
1739	1737	),
1740	1738
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),
1743	1740	__entry->xid, __entry->status
1744	1741	)
1745	1742	);

@@ -971,7 +971,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp) · 970 unmodified lines
971	971	err1:
972	972	svc_rdma_send_ctxt_put(rdma, sctxt);
973	973	err0:
974		− trace_svcrdma_send_failed(rqstp, ret);
	974	+ trace_svcrdma_send_err(rqstp, ret);
975	975	set_bit(XPT_CLOSE, &xprt->xpt_flags);
976	976	return -ENOTCONN;
977	977	}