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

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

SUNRPC: remove BUG_ON from rpc_sleep_on* 



Replace BUG_ON() with WARN_ON_ONCE() and clean up after inactive task.

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

net/sunrpc/sched.c

+12 −2
Original line number Diff line number Diff line
@@ -343,7 +343,12 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task, 
				rpc_action action)

{

	/* We shouldn't ever put an inactive task to sleep */

	BUG_ON(!RPC_IS_ACTIVATED(task));

	WARN_ON_ONCE(!RPC_IS_ACTIVATED(task));

	if (!RPC_IS_ACTIVATED(task)) {

		task->tk_status = -EIO;

		rpc_put_task_async(task);

		return;

	}



	/*

	 * Protect the queue operations.
@@ -358,7 +363,12 @@ void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task, 
		rpc_action action, int priority)

{

	/* We shouldn't ever put an inactive task to sleep */

	BUG_ON(!RPC_IS_ACTIVATED(task));

	WARN_ON_ONCE(!RPC_IS_ACTIVATED(task));

	if (!RPC_IS_ACTIVATED(task)) {

		task->tk_status = -EIO;

		rpc_put_task_async(task);

		return;

	}



	/*

	 * Protect the queue operations.