SUNRPC: Replace connect dprintk call sites with a tracepoint

This trace event can be used to audit transport connections from the
client.

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

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 90d7b9916fe3eee2877c3e8bc042f69b047899bd..0aa15cc3985d7839aa2230e4277a4112e0386a24 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -983,6 +983,7 @@ DECLARE_EVENT_CLASS(rpc_xprt_lifetime_class,
                        TP_ARGS(xprt))
 
 DEFINE_RPC_XPRT_LIFETIME_EVENT(create);
+DEFINE_RPC_XPRT_LIFETIME_EVENT(connect);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_auto);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_done);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_force);

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 7d97d18df9bd0df3228cfafb2def0f8a273f1676..48d86814b942cfd63c270e6d739e84bbaa3f3eb0 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2055,10 +2055,6 @@ call_connect(struct rpc_task *task)
                return;
        }
 
-       dprintk("RPC: %5u call_connect xprt %p %s connected\n",
-                       task->tk_pid, xprt,
-                       (xprt_connected(xprt) ? "is" : "is not"));
-
        task->tk_action = call_connect_status;
        if (task->tk_status < 0)
                return;

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 9da7c6e72c2d811e1fe26eed00e65969ea149116..ceb190d1754d95c07574bdb45726d80c9c9dfbd6 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -834,8 +834,7 @@ void xprt_connect(struct rpc_task *task)
 {
        struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
 
-       dprintk("RPC: %5u xprt_connect xprt %p %s connected\n", task->tk_pid,
-                       xprt, (xprt_connected(xprt) ? "is" : "is not"));
+       trace_xprt_connect(xprt);
 
        if (!xprt_bound(xprt)) {
                task->tk_status = -EAGAIN;