Skip to content

Commit

Permalink
usermodehelper: introduce umh_complete(sub_info)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 23, 2012
1 parent 70834d3 commit b344992
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions kernel/kmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,11 @@ void call_usermodehelper_freeinfo(struct subprocess_info *info)
}
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)
{
Expand Down Expand Up @@ -235,7 +240,7 @@ static int wait_for_helper(void *data)
sub_info->retval = ret;
}

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

Expand Down Expand Up @@ -269,7 +274,7 @@ static void __call_usermodehelper(struct work_struct *work)
case UMH_WAIT_EXEC:
if (pid < 0)
sub_info->retval = pid;
complete(sub_info->complete);
umh_complete(sub_info);
}
}

Expand Down

0 comments on commit b344992

Please sign in to comment.