xprtrdma: Rename CQE field in Receive trace points

Make the field name the same for all trace points that handle
pointers to struct rpcrdma_rep. That makes it easy to grep for
matching rep points in trace output.

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

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index f6a4eaa85a3ed4afa38ff7678dbe018d6985f2be..6e6055eb67e783ed1aa7cc76c681254cbba5de12 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -623,21 +623,21 @@ TRACE_EVENT(xprtrdma_post_send,
 
 TRACE_EVENT(xprtrdma_post_recv,
        TP_PROTO(
-               const struct ib_cqe *cqe
+               const struct rpcrdma_rep *rep
        ),
 
-       TP_ARGS(cqe),
+       TP_ARGS(rep),
 
        TP_STRUCT__entry(
-               __field(const void *, cqe)
+               __field(const void *, rep)
        ),
 
        TP_fast_assign(
-               __entry->cqe = cqe;
+               __entry->rep = rep;
        ),
 
-       TP_printk("cqe=%p",
-               __entry->cqe
+       TP_printk("rep=%p",
+               __entry->rep
        )
 );
 
@@ -715,14 +715,15 @@ TRACE_EVENT(xprtrdma_wc_receive,
        TP_ARGS(wc),
 
        TP_STRUCT__entry(
-               __field(const void *, cqe)
+               __field(const void *, rep)
                __field(u32, byte_len)
                __field(unsigned int, status)
                __field(u32, vendor_err)
        ),
 
        TP_fast_assign(
-               __entry->cqe = wc->wr_cqe;
+               __entry->rep = container_of(wc->wr_cqe, struct rpcrdma_rep,
+                                           rr_cqe);
                __entry->status = wc->status;
                if (wc->status) {
                        __entry->byte_len = 0;
@@ -733,8 +734,8 @@ TRACE_EVENT(xprtrdma_wc_receive,
                }
        ),
 
-       TP_printk("cqe=%p %u bytes: %s (%u/0x%x)",
-               __entry->cqe, __entry->byte_len,
+       TP_printk("rep=%p %u bytes: %s (%u/0x%x)",
+               __entry->rep, __entry->byte_len,
                rdma_show_wc_status(__entry->status),
                __entry->status, __entry->vendor_err
        )

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index e639ea0faf193b3b57c035e7b4346da377e50977..3c275a7a4e4c3c08a9c7caf36584d662371c7222 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1531,7 +1531,7 @@ rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp)
                if (!rpcrdma_regbuf_dma_map(r_xprt, rep->rr_rdmabuf))
                        goto release_wrs;
 
-               trace_xprtrdma_post_recv(rep->rr_recv_wr.wr_cqe);
+               trace_xprtrdma_post_recv(rep);
                ++count;
        }