3 files changed, 8 insertions, 8 deletions

diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c
index f1cf3a36a992..7f5632cd5a48 100644
--- a/net/sunrpc/xprtrdma/fmr_ops.c
+++ b/net/sunrpc/xprtrdma/fmr_ops.c
@@ -97,7 +97,7 @@ fmr_mr_recycle_worker(struct work_struct *work)
 
         trace_xprtrdma_mr_recycle(mr);
 
-        trace_xprtrdma_dma_unmap(mr);
+        trace_xprtrdma_mr_unmap(mr);
         ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,
                         mr->mr_sg, mr->mr_nents, mr->mr_dir);
 
@@ -234,7 +234,7 @@ fmr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg,
                                      mr->mr_sg, i, mr->mr_dir);
         if (!mr->mr_nents)
                 goto out_dmamap_err;
-        trace_xprtrdma_dma_map(mr);
+        trace_xprtrdma_mr_map(mr);
 
         for (i = 0, dma_pages = mr->fmr.fm_physaddrs; i < mr->mr_nents; i++)
                 dma_pages[i] = sg_dma_address(&mr->mr_sg[i]);
@@ -295,7 +295,7 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
         list_for_each_entry(mr, mrs, mr_list) {
                 dprintk("RPC:       %s: unmapping fmr %p\n",
                         __func__, &mr->fmr);
-                trace_xprtrdma_localinv(mr);
+                trace_xprtrdma_mr_localinv(mr);
                 list_add_tail(&mr->fmr.fm_mr->list, &unmap_list);
         }
         r_xprt->rx_stats.local_inv_needed++;
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 6594627e3c7d..fc6378cc0c1c 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -123,7 +123,7 @@ frwr_mr_recycle_worker(struct work_struct *work)
         trace_xprtrdma_mr_recycle(mr);
 
         if (state != FRWR_FLUSHED_LI) {
-                trace_xprtrdma_dma_unmap(mr);
+                trace_xprtrdma_mr_unmap(mr);
                 ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,
                                 mr->mr_sg, mr->mr_nents, mr->mr_dir);
         }
@@ -384,7 +384,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg,
         mr->mr_nents = ib_dma_map_sg(ia->ri_device, mr->mr_sg, i, mr->mr_dir);
         if (!mr->mr_nents)
                 goto out_dmamap_err;
-        trace_xprtrdma_dma_map(mr);
+        trace_xprtrdma_mr_map(mr);
 
         ibmr = frwr->fr_mr;
         n = ib_map_mr_sg(ibmr, mr->mr_sg, mr->mr_nents, NULL, PAGE_SIZE);
@@ -466,7 +466,7 @@ frwr_op_reminv(struct rpcrdma_rep *rep, struct list_head *mrs)
         list_for_each_entry(mr, mrs, mr_list)
                 if (mr->mr_handle == rep->rr_inv_rkey) {
                         list_del_init(&mr->mr_list);
-                        trace_xprtrdma_remoteinv(mr);
+                        trace_xprtrdma_mr_remoteinv(mr);
                         mr->frwr.fr_state = FRWR_IS_INVALID;
                         rpcrdma_mr_unmap_and_put(mr);
                         break;  /* only one invalidated MR per RPC */
@@ -503,7 +503,7 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct list_head *mrs)
                 mr->frwr.fr_state = FRWR_IS_INVALID;
 
                 frwr = &mr->frwr;
-                trace_xprtrdma_localinv(mr);
+                trace_xprtrdma_mr_localinv(mr);
 
                 frwr->fr_cqe.done = frwr_wc_localinv;
                 last = &frwr->fr_invwr;
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 88fe75e6d41a..3a9a62d28283 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1288,7 +1288,7 @@ rpcrdma_mr_unmap_and_put(struct rpcrdma_mr *mr)
 {
         struct rpcrdma_xprt *r_xprt = mr->mr_xprt;
 
-        trace_xprtrdma_dma_unmap(mr);
+        trace_xprtrdma_mr_unmap(mr);
         ib_dma_unmap_sg(r_xprt->rx_ia.ri_device,
                         mr->mr_sg, mr->mr_nents, mr->mr_dir);
         __rpcrdma_mr_put(&r_xprt->rx_buf, mr);