lkml.org 
[lkml]   [2013]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 144/153] usermodehelper: introduce umh_complete(sub_info)
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Oleg Nesterov <oleg@redhat.com>

    commit b3449922502f5a161ee2b5022a33aec8472fbf18 upstream.

    Preparation. Add the new trivial helper, umh_complete(). Currently it
    simply does complete(sub_info->complete).

    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    kernel/kmod.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/kernel/kmod.c
    +++ b/kernel/kmod.c
    @@ -197,6 +197,11 @@ void call_usermodehelper_freeinfo(struct
    }
    EXPORT_SYMBOL(call_usermodehelper_freeinfo);

    +static void umh_complete(struct subprocess_info *sub_info)
    +{
    + complete(sub_info->complete);
    +}
    +
    /* Keventd can't block, but this (a child) can. */
    static int wait_for_helper(void *data)
    {
    @@ -233,7 +238,7 @@ static int wait_for_helper(void *data)
    sub_info->retval = ret;
    }

    - complete(sub_info->complete);
    + umh_complete(sub_info);
    return 0;
    }

    @@ -267,7 +272,7 @@ static void __call_usermodehelper(struct
    case UMH_WAIT_EXEC:
    if (pid < 0)
    sub_info->retval = pid;
    - complete(sub_info->complete);
    + umh_complete(sub_info);
    }
    }




    \
     
     \ /
      Last update: 2013-03-04 06:01    [W:4.066 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site