Commit 721a1d38 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Remove dprintk call sites in RPC queuing functions 



Remove redundant call sites or call sites that are already covered
by tracepoints.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 1466c221

include/trace/events/sunrpc.h

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ DEFINE_RPC_RUNNING_EVENT(run_action); 
DEFINE_RPC_RUNNING_EVENT(sync_sleep);

DEFINE_RPC_RUNNING_EVENT(sync_wake);

DEFINE_RPC_RUNNING_EVENT(complete);

DEFINE_RPC_RUNNING_EVENT(timeout);

DEFINE_RPC_RUNNING_EVENT(signalled);

DEFINE_RPC_RUNNING_EVENT(end);

net/sunrpc/sched.c

+1 −21
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ __rpc_disable_timer(struct rpc_wait_queue *queue, struct rpc_task *task) 
{

	if (list_empty(&task->u.tk_wait.timer_list))

		return;

	dprintk("RPC: %5u disabling timer\n", task->tk_pid);

	task->tk_timeout = 0;

	list_del(&task->u.tk_wait.timer_list);

	if (list_empty(&queue->timer_list.list))
@@ -111,9 +110,6 @@ static void 
__rpc_add_timer(struct rpc_wait_queue *queue, struct rpc_task *task,

		unsigned long timeout)

{

	dprintk("RPC: %5u setting alarm for %u ms\n",

		task->tk_pid, jiffies_to_msecs(timeout - jiffies));



	task->tk_timeout = timeout;

	if (list_empty(&queue->timer_list.list) || time_before(timeout, queue->timer_list.expires))

		rpc_set_queue_timer(queue, timeout);
@@ -216,9 +212,6 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, 
	/* barrier matches the read in rpc_wake_up_task_queue_locked() */

	smp_wmb();

	rpc_set_queued(task);



	dprintk("RPC: %5u added to queue %p \"%s\"\n",

			task->tk_pid, queue, rpc_qname(queue));

}



/*
@@ -241,8 +234,6 @@ static void __rpc_remove_wait_queue(struct rpc_wait_queue *queue, struct rpc_tas 
	else

		list_del(&task->u.tk_wait.list);

	queue->qlen--;

	dprintk("RPC: %5u removed from queue %p \"%s\"\n",

			task->tk_pid, queue, rpc_qname(queue));

}



static void __rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const char *qname, unsigned char nr_queues)
@@ -382,13 +373,9 @@ static void __rpc_do_sleep_on_priority(struct rpc_wait_queue *q, 
		struct rpc_task *task,

		unsigned char queue_priority)

{

	dprintk("RPC: %5u sleep_on(queue \"%s\" time %lu)\n",

			task->tk_pid, rpc_qname(q), jiffies);



	trace_rpc_task_sleep(task, q);



	__rpc_add_wait_queue(q, task, queue_priority);



}



static void __rpc_sleep_on_priority(struct rpc_wait_queue *q,
@@ -510,9 +497,6 @@ static void __rpc_do_wake_up_task_on_wq(struct workqueue_struct *wq, 
		struct rpc_wait_queue *queue,

		struct rpc_task *task)

{

	dprintk("RPC: %5u __rpc_wake_up_task (now %lu)\n",

			task->tk_pid, jiffies);



	/* Has the task been executed yet? If not, we cannot wake it up! */

	if (!RPC_IS_ACTIVATED(task)) {

		printk(KERN_ERR "RPC: Inactive task (%p) being woken up!\n", task);
@@ -524,8 +508,6 @@ static void __rpc_do_wake_up_task_on_wq(struct workqueue_struct *wq, 
	__rpc_remove_wait_queue(queue, task);



	rpc_make_runnable(wq, task);



	dprintk("RPC:       __rpc_wake_up_task done\n");

}



/*
@@ -663,8 +645,6 @@ struct rpc_task *rpc_wake_up_first_on_wq(struct workqueue_struct *wq, 
{

	struct rpc_task	*task = NULL;



	dprintk("RPC:       wake_up_first(%p \"%s\")\n",

			queue, rpc_qname(queue));

	spin_lock(&queue->lock);

	task = __rpc_find_next_queued(queue);

	if (task != NULL)
@@ -770,7 +750,7 @@ static void __rpc_queue_timer_fn(struct work_struct *work) 
	list_for_each_entry_safe(task, n, &queue->timer_list.list, u.tk_wait.timer_list) {

		timeo = task->tk_timeout;

		if (time_after_eq(now, timeo)) {

			dprintk("RPC: %5u timeout\n", task->tk_pid);

			trace_rpc_task_timeout(task, task->tk_action);

			task->tk_status = -ETIMEDOUT;

			rpc_wake_up_task_queue_locked(queue, task);

			continue;