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

Commit 2bd4eef8 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

SUNRPC: remove BUG_ONs checking RPC_IS_QUEUED 



Replace two BUG_ON() calls with WARN_ON_ONCE() and early returns.

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f50ad428

net/sunrpc/sched.c

+6 −2
Original line number Diff line number Diff line
@@ -133,7 +133,9 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, 
		struct rpc_task *task,

		unsigned char queue_priority)

{

	BUG_ON (RPC_IS_QUEUED(task));

	WARN_ON_ONCE(RPC_IS_QUEUED(task));

	if (RPC_IS_QUEUED(task))

		return;



	if (RPC_IS_PRIORITY(queue))

		__rpc_add_wait_queue_priority(queue, task, queue_priority);
@@ -707,7 +709,9 @@ static void __rpc_execute(struct rpc_task *task) 
	dprintk("RPC: %5u __rpc_execute flags=0x%x\n",

			task->tk_pid, task->tk_flags);



	BUG_ON(RPC_IS_QUEUED(task));

	WARN_ON_ONCE(RPC_IS_QUEUED(task));

	if (RPC_IS_QUEUED(task))

		return;



	for (;;) {

		void (*do_action)(struct rpc_task *);