Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72b6cec authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Remove the 'tk_magic' debugging field 



It has not triggered in almost a decade. Time to get rid of it...

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d60dbb20

include/linux/sunrpc/sched.h

+0 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ struct rpc_wait { 
 * This is the RPC task struct

 */

struct rpc_task {

#ifdef RPC_DEBUG

	unsigned long		tk_magic;	/* 0xf00baa */

#endif

	atomic_t		tk_count;	/* Reference count */

	struct list_head	tk_task;	/* global list of tasks */

	struct rpc_clnt *	tk_client;	/* RPC client */

net/sunrpc/sched.c

+0 −11
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#ifdef RPC_DEBUG

#define RPCDBG_FACILITY		RPCDBG_SCHED

#define RPC_TASK_MAGIC_ID	0xf00baa

#endif



/*
@@ -237,7 +236,6 @@ static void rpc_task_set_debuginfo(struct rpc_task *task) 
{

	static atomic_t rpc_pid;



	task->tk_magic = RPC_TASK_MAGIC_ID;

	task->tk_pid = atomic_inc_return(&rpc_pid);

}

#else
@@ -360,9 +358,6 @@ static void __rpc_do_wake_up_task(struct rpc_wait_queue *queue, struct rpc_task 
	dprintk("RPC: %5u __rpc_wake_up_task (now %lu)\n",

			task->tk_pid, jiffies);



#ifdef RPC_DEBUG

	BUG_ON(task->tk_magic != RPC_TASK_MAGIC_ID);

#endif

	/* 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);
@@ -916,9 +911,6 @@ EXPORT_SYMBOL_GPL(rpc_put_task); 


static void rpc_release_task(struct rpc_task *task)

{

#ifdef RPC_DEBUG

	BUG_ON(task->tk_magic != RPC_TASK_MAGIC_ID);

#endif

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



	if (!list_empty(&task->tk_task)) {
@@ -930,9 +922,6 @@ static void rpc_release_task(struct rpc_task *task) 
	}

	BUG_ON (RPC_IS_QUEUED(task));



#ifdef RPC_DEBUG

	task->tk_magic = 0;

#endif

	/* Wake up anyone who is waiting for task completion */

	rpc_mark_complete_task(task);