diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-15 19:56:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:45:51 -0700 |
| commit | 585f09f8bfb60e2b093da4fc7d6078dd8e161bb4 (patch) | |
| tree | d3d55d80a3b86c294328dbc92b51cf67de2fc3bb | |
| parent | 314877d903f32978fc0fbd7eb335c044c9887c27 (diff) | |
SUNRPC: Ensure we always run the tk_callback before tk_action
commit e020c6800c9621a77223bf2c1ff68180e41e8ebf 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: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/sunrpc/sched.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index aae6907fd546..03a5c9ec2caf 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -642,14 +642,12 @@ static void __rpc_execute(struct rpc_task *task) save_callback = task->tk_callback; task->tk_callback = NULL; save_callback(task); - } - - /* - * Perform the next FSM step. - * tk_action may be NULL when the task has been killed - * by someone else. - */ - if (!RPC_IS_QUEUED(task)) { + } else { + /* + * Perform the next FSM step. + * tk_action may be NULL when the task has been killed + * by someone else. + */ if (task->tk_action == NULL) break; task->tk_action(task); |