From patchwork Mon Mar 26 18:01:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Lucid,04/10] usermodehelper: introduce umh_complete(sub_info) Date: Mon, 26 Mar 2012 08:01:37 -0000 From: Tim Gardner X-Patchwork-Id: 148790 Message-Id: <1332784903-75063-5-git-send-email-tim.gardner@canonical.com> To: kernel-team@lists.ubuntu.com From: Oleg Nesterov BugLink: http://bugs.launchpad.net/bugs/963685 Preparation. Add the new trivial helper, umh_complete(). Currently it simply does complete(sub_info->complete). Signed-off-by: Oleg Nesterov Cc: Tetsuo Handa Cc: Rusty Russell Cc: Tejun Heo Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit b3449922502f5a161ee2b5022a33aec8472fbf18) Signed-off-by: Tim Gardner --- kernel/kmod.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/kmod.c b/kernel/kmod.c index dd79012..70ffc15 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -202,6 +202,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) { @@ -241,7 +246,7 @@ static int wait_for_helper(void *data) if (sub_info->wait == UMH_NO_WAIT) call_usermodehelper_freeinfo(sub_info); else - complete(sub_info->complete); + umh_complete(sub_info); return 0; } @@ -276,7 +281,7 @@ static void __call_usermodehelper(struct work_struct *work) /* FALLTHROUGH */ case UMH_WAIT_EXEC: - complete(sub_info->complete); + umh_complete(sub_info); } }