svcrdma: Rename tracepoints that record header decoding errors

Clean up: Use a consistent naming convention so that these trace
points can be enabled quickly via a glob.

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

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index c046b19..53b24c8 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1355,7 +1355,7 @@ TRACE_EVENT(svcrdma_decode_rqst,
                show_rpcrdma_proc(__entry->proc), __entry->hdrlen)
 );
 
-TRACE_EVENT(svcrdma_decode_short,
+TRACE_EVENT(svcrdma_decode_short_err,
        TP_PROTO(
                unsigned int hdrlen
        ),
@@ -1399,7 +1399,8 @@ DECLARE_EVENT_CLASS(svcrdma_badreq_event,
 );
 
 #define DEFINE_BADREQ_EVENT(name)                                      \
-               DEFINE_EVENT(svcrdma_badreq_event, svcrdma_decode_##name,\
+               DEFINE_EVENT(svcrdma_badreq_event,                      \
+                            svcrdma_decode_##name##_err,               \
                                TP_PROTO(                               \
                                        __be32 *p                       \
                                ),                                      \

diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index eee7c64..e426fed 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -665,23 +665,23 @@ static int svc_rdma_xdr_decode_req(struct xdr_buf *rq_arg,
        return hdr_len;
 
 out_short:
-       trace_svcrdma_decode_short(rq_arg->len);
+       trace_svcrdma_decode_short_err(rq_arg->len);
        return -EINVAL;
 
 out_version:
-       trace_svcrdma_decode_badvers(rdma_argp);
+       trace_svcrdma_decode_badvers_err(rdma_argp);
        return -EPROTONOSUPPORT;
 
 out_drop:
-       trace_svcrdma_decode_drop(rdma_argp);
+       trace_svcrdma_decode_drop_err(rdma_argp);
        return 0;
 
 out_proc:
-       trace_svcrdma_decode_badproc(rdma_argp);
+       trace_svcrdma_decode_badproc_err(rdma_argp);
        return -EINVAL;
 
 out_inval:
-       trace_svcrdma_decode_parse(rdma_argp);
+       trace_svcrdma_decode_parse_err(rdma_argp);
        return -EINVAL;
 }