Commit bac39af7 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman

SUNRPC: Ensure we always run the tk_callback before tk_action

commit e020c680 upstream.

This fixes a race in which the task->tk_callback() puts the rpc_task
to sleep, setting a new callback. Under certain circumstances, the current
code may end up executing the task->tk_action before it gets round to the
callback.
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0b67526b
...@@ -637,14 +637,12 @@ static void __rpc_execute(struct rpc_task *task) ...@@ -637,14 +637,12 @@ static void __rpc_execute(struct rpc_task *task)
save_callback = task->tk_callback; save_callback = task->tk_callback;
task->tk_callback = NULL; task->tk_callback = NULL;
save_callback(task); save_callback(task);
} } else {
/*
/* * Perform the next FSM step.
* Perform the next FSM step. * tk_action may be NULL when the task has been killed
* tk_action may be NULL when the task has been killed * by someone else.
* by someone else. */
*/
if (!RPC_IS_QUEUED(task)) {
if (task->tk_action == NULL) if (task->tk_action == NULL)
break; break;
task->tk_action(task); task->tk_action(task);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment