svcrdma: Remove svcrdma_cm_event() trace point

Clean up. This trace point is no longer needed because the RDMA/core
CMA code has an equivalent trace point that was added by commit
ed999f820a6c ("RDMA/cma: Add trace points in RDMA Connection
Manager").

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

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index c0e4c93324f57ab40b3cf0986c06d05cd6c0fb02..545fe936a0cce14c90f2369810dacbb7ca0505fa 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1813,34 +1813,6 @@ TRACE_EVENT(svcrdma_post_rw,
 DEFINE_SENDCOMP_EVENT(read);
 DEFINE_SENDCOMP_EVENT(write);
 
-TRACE_EVENT(svcrdma_cm_event,
-       TP_PROTO(
-               const struct rdma_cm_event *event,
-               const struct sockaddr *sap
-       ),
-
-       TP_ARGS(event, sap),
-
-       TP_STRUCT__entry(
-               __field(unsigned int, event)
-               __field(int, status)
-               __array(__u8, addr, INET6_ADDRSTRLEN + 10)
-       ),
-
-       TP_fast_assign(
-               __entry->event = event->event;
-               __entry->status = event->status;
-               snprintf(__entry->addr, sizeof(__entry->addr) - 1,
-                        "%pISpc", sap);
-       ),
-
-       TP_printk("addr=%s event=%s (%u/%d)",
-               __entry->addr,
-               rdma_show_cm_event(__entry->event),
-               __entry->event, __entry->status
-       )
-);
-
 TRACE_EVENT(svcrdma_qp_error,
        TP_PROTO(
                const struct ib_event *event,

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index f6aad2798063d83f50acb58eb1b806e3e5aab896..8bb99980ae8562eb4ba4a62f7f2d5ee7f63c0887 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -241,10 +241,6 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id,
 static int rdma_listen_handler(struct rdma_cm_id *cma_id,
                               struct rdma_cm_event *event)
 {
-       struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;
-
-       trace_svcrdma_cm_event(event, sap);
-
        switch (event->event) {
        case RDMA_CM_EVENT_CONNECT_REQUEST:
                dprintk("svcrdma: Connect request on cma_id=%p, xprt = %p, "
@@ -266,12 +262,9 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id,
 static int rdma_cma_handler(struct rdma_cm_id *cma_id,
                            struct rdma_cm_event *event)
 {
-       struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.dst_addr;
        struct svcxprt_rdma *rdma = cma_id->context;
        struct svc_xprt *xprt = &rdma->sc_xprt;
 
-       trace_svcrdma_cm_event(event, sap);
-
        switch (event->event) {
        case RDMA_CM_EVENT_ESTABLISHED:
                /* Accept complete */