SUNRPC: Remove the dprint_status() macro

Clean up: The rpc_task_run_action tracepoint serves the same
purpose.

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

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 3ab9e6a..b51e744 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -47,10 +47,6 @@
 # define RPCDBG_FACILITY       RPCDBG_CALL
 #endif
 
-#define dprint_status(t)                                       \
-       dprintk("RPC: %5u %s (status %d)\n", t->tk_pid,         \
-                       __func__, t->tk_status)
-
 /*
  * All RPC clients are linked into this list
  */
@@ -1658,8 +1654,6 @@ call_start(struct rpc_task *task)
 static void
 call_reserve(struct rpc_task *task)
 {
-       dprint_status(task);
-
        task->tk_status  = 0;
        task->tk_action  = call_reserveresult;
        xprt_reserve(task);
@@ -1675,8 +1669,6 @@ call_reserveresult(struct rpc_task *task)
 {
        int status = task->tk_status;
 
-       dprint_status(task);
-
        /*
         * After a call to xprt_reserve(), we must have either
         * a request slot or else an error status.
@@ -1717,8 +1709,6 @@ call_reserveresult(struct rpc_task *task)
 static void
 call_retry_reserve(struct rpc_task *task)
 {
-       dprint_status(task);
-
        task->tk_status  = 0;
        task->tk_action  = call_reserveresult;
        xprt_retry_reserve(task);
@@ -1730,8 +1720,6 @@ call_retry_reserve(struct rpc_task *task)
 static void
 call_refresh(struct rpc_task *task)
 {
-       dprint_status(task);
-
        task->tk_action = call_refreshresult;
        task->tk_status = 0;
        task->tk_client->cl_stats->rpcauthrefresh++;
@@ -1746,8 +1734,6 @@ call_refreshresult(struct rpc_task *task)
 {
        int status = task->tk_status;
 
-       dprint_status(task);
-
        task->tk_status = 0;
        task->tk_action = call_refresh;
        switch (status) {
@@ -1792,8 +1778,6 @@ call_allocate(struct rpc_task *task)
        const struct rpc_procinfo *proc = task->tk_msg.rpc_proc;
        int status;
 
-       dprint_status(task);
-
        task->tk_status = 0;
        task->tk_action = call_encode;
 
@@ -1882,7 +1866,7 @@ call_encode(struct rpc_task *task)
 {
        if (!rpc_task_need_encode(task))
                goto out;
-       dprint_status(task);
+
        /* Dequeue task from the receive queue while we're encoding */
        xprt_request_dequeue_xprt(task);
        /* Encode here so that rpcsec_gss can use correct sequence number. */
@@ -1959,8 +1943,6 @@ call_bind(struct rpc_task *task)
                return;
        }
 
-       dprint_status(task);
-
        task->tk_action = call_bind_status;
        if (!xprt_prepare_transmit(task))
                return;
@@ -1982,7 +1964,6 @@ call_bind_status(struct rpc_task *task)
                return;
        }
 
-       dprint_status(task);
        trace_rpc_bind_status(task);
        if (task->tk_status >= 0)
                goto out_next;
@@ -2109,7 +2090,6 @@ call_connect_status(struct rpc_task *task)
                return;
        }
 
-       dprint_status(task);
        trace_rpc_connect_status(task);
 
        if (task->tk_status == 0) {
@@ -2177,8 +2157,6 @@ call_transmit(struct rpc_task *task)
                return;
        }
 
-       dprint_status(task);
-
        task->tk_action = call_transmit_status;
        if (!xprt_prepare_transmit(task))
                return;
@@ -2213,7 +2191,6 @@ call_transmit_status(struct rpc_task *task)
 
        switch (task->tk_status) {
        default:
-               dprint_status(task);
                break;
        case -EBADMSG:
                task->tk_status = 0;
@@ -2295,8 +2272,6 @@ call_bc_transmit_status(struct rpc_task *task)
        if (rpc_task_transmitted(task))
                task->tk_status = 0;
 
-       dprint_status(task);
-
        switch (task->tk_status) {
        case 0:
                /* Success */
@@ -2356,8 +2331,6 @@ call_status(struct rpc_task *task)
        if (!task->tk_msg.rpc_proc->p_proc)
                trace_xprt_ping(task->tk_xprt, task->tk_status);
 
-       dprint_status(task);
-
        status = task->tk_status;
        if (status >= 0) {
                task->tk_action = call_decode;
@@ -2492,8 +2465,6 @@ call_decode(struct rpc_task *task)
        struct xdr_stream xdr;
        int err;
 
-       dprint_status(task);
-
        if (!task->tk_msg.rpc_proc->p_decode) {
                task->tk_action = rpc_exit_task;
                return;