Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpc: minor cleanup of scheduler callback code

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

Also, this macro definition seems unnecessary.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
\\\"J. Bruce Fields\\\ 2008-06-09 16:51:35 -04:00 committed by Trond Myklebust
parent d25a03cf96
commit a486aeda9b
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sunrpc/sched.h
View File

@ -135,7 +135,6 @@ struct rpc_task_setup {
#define RPC_IS_SWAPPER(t) ((t)->tk_flags & RPC_TASK_SWAPPER) #define RPC_IS_SWAPPER(t) ((t)->tk_flags & RPC_TASK_SWAPPER)
#define RPC_DO_ROOTOVERRIDE(t) ((t)->tk_flags & RPC_TASK_ROOTCREDS) #define RPC_DO_ROOTOVERRIDE(t) ((t)->tk_flags & RPC_TASK_ROOTCREDS)
#define RPC_ASSASSINATED(t) ((t)->tk_flags & RPC_TASK_KILLED) #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_IS_SOFT(t) ((t)->tk_flags & RPC_TASK_SOFT)
#define RPC_TASK_RUNNING 0 #define RPC_TASK_RUNNING 0

14
net/sunrpc/sched.c
View File

@ -626,19 +626,15 @@ static void __rpc_execute(struct rpc_task *task)
/* /*
* Execute any pending callback. * Execute any pending callback.
*/ */
if (RPC_DO_CALLBACK(task)) { if (task->tk_callback) {
/* Define a callback save pointer */
void (*save_callback)(struct rpc_task *); void (*save_callback)(struct rpc_task *);
/* /*
* If a callback exists, save it, reset it, * We set tk_callback to NULL before calling it,
* call it. * in case it sets the tk_callback field itself:
* The save is needed to stop from resetting
* another callback set within the callback handler
* - Dave
*/ */
save_callback=task->tk_callback; save_callback = task->tk_callback;
task->tk_callback=NULL; task->tk_callback = NULL;
save_callback(task); save_callback(task);
} }