usermodehelper: introduce umh_complete(sub_info)

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 <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>
(cherry picked from commit b3449922502f5a161ee2b5022a33aec8472fbf18)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/kernel/kmod.c b/kernel/kmod.c
index fabfe541b1d..4c3fa8fbc34 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -197,6 +197,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)
 {
@@ -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 work_struct *work)
         case UMH_WAIT_EXEC:
                 if (pid < 0)
                         sub_info->retval = pid;
-                complete(sub_info->complete);
+                umh_complete(sub_info);
         }
 }