SUNRPC: Trace call_refresh events

Clean up: Replace dprintk call sites.

Note that rpc_call_rpcerror() already has a trace point, so perhaps
adding trace_rpc_refresh_status() isn't necessary. However, it does
report a particular category of error.

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 edb41e187cf6e5c8fcf88b033958f126327c4662..3c5d707f7d54e5bb1d0263dd166a0c5106ff9636 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -262,6 +262,8 @@ DEFINE_RPC_STATUS_EVENT(call);
 DEFINE_RPC_STATUS_EVENT(bind);
 DEFINE_RPC_STATUS_EVENT(connect);
 DEFINE_RPC_STATUS_EVENT(timeout);
+DEFINE_RPC_STATUS_EVENT(retry_refresh);
+DEFINE_RPC_STATUS_EVENT(refresh);
 
 TRACE_EVENT(rpc_request,
        TP_PROTO(const struct rpc_task *task),

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index cabde92f283d9645bf13f5d51ee0c65a40346636..af7c88e41e11d14bb063741814f2f6a1638a25f0 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1752,12 +1752,10 @@ call_refreshresult(struct rpc_task *task)
                if (!task->tk_cred_retry)
                        break;
                task->tk_cred_retry--;
-               dprintk("RPC: %5u %s: retry refresh creds\n",
-                               task->tk_pid, __func__);
+               trace_rpc_retry_refresh_status(task);
                return;
        }
-       dprintk("RPC: %5u %s: refresh creds failed with error %d\n",
-                               task->tk_pid, __func__, status);
+       trace_rpc_refresh_status(task);
        rpc_call_rpcerror(task, status);
 }
 
@@ -1881,8 +1879,7 @@ call_encode(struct rpc_task *task)
                        } else {
                                task->tk_action = call_refresh;
                                task->tk_cred_retry--;
-                               dprintk("RPC: %5u %s: retry refresh creds\n",
-                                       task->tk_pid, __func__);
+                               trace_rpc_retry_refresh_status(task);
                        }
                        break;
                default: