Commit a486aeda authored by \\\"J. Bruce Fields\\\'s avatar \\\"J. Bruce Fields\\\ Committed by Trond Myklebust
Browse files

rpc: minor cleanup of scheduler callback code 



Try to make the comment here a little more clear and concise.

Also, this macro definition seems unnecessary.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d25a03cf

include/linux/sunrpc/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct rpc_task_setup { 
#define RPC_IS_SWAPPER(t)	((t)->tk_flags & RPC_TASK_SWAPPER)

#define RPC_DO_ROOTOVERRIDE(t)	((t)->tk_flags & RPC_TASK_ROOTCREDS)

#define RPC_ASSASSINATED(t)	((t)->tk_flags & RPC_TASK_KILLED)

#define RPC_DO_CALLBACK(t)	((t)->tk_callback != NULL)

#define RPC_IS_SOFT(t)		((t)->tk_flags & RPC_TASK_SOFT)



#define RPC_TASK_RUNNING	0

net/sunrpc/sched.c

+5 −9
Original line number Diff line number Diff line
@@ -626,16 +626,12 @@ static void __rpc_execute(struct rpc_task *task) 
		/*

		 * Execute any pending callback.

		 */

		if (RPC_DO_CALLBACK(task)) {

			/* Define a callback save pointer */

		if (task->tk_callback) {

			void (*save_callback)(struct rpc_task *);



			/*

			 * If a callback exists, save it, reset it,

			 * call it.

			 * The save is needed to stop from resetting

			 * another callback set within the callback handler

			 * - Dave

			 * We set tk_callback to NULL before calling it,

			 * in case it sets the tk_callback field itself:

			 */

			save_callback = task->tk_callback;

			task->tk_callback = NULL;