lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[68/87] SUNRPC: Ensure we always run the tk_callback before tk_action
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    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>

    ---
    net/sunrpc/sched.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    --- a/net/sunrpc/sched.c
    +++ b/net/sunrpc/sched.c
    @@ -623,14 +623,12 @@ static void __rpc_execute(struct rpc_tas
    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);



    \
     
     \ /
      Last update: 2011-03-22 00:39    [W:5.639 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site