Patchwork [Natty,2/8] usermodehelper: introduce umh_complete(sub_info)

login
register
mail settings
Submitter Tim Gardner
Date March 26, 2012, 2:53 p.m.
Message ID <1332773641-125992-3-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/148760/
State New
Headers show

Comments

Tim Gardner - March 26, 2012, 2:53 p.m.
From: Oleg Nesterov <oleg@redhat.com>

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>
---
 kernel/kmod.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 9cd0591..5292964 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -171,6 +171,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)
 {
@@ -207,7 +212,7 @@  static int wait_for_helper(void *data)
 			sub_info->retval = ret;
 	}
 
-	complete(sub_info->complete);
+	umh_complete(sub_info);
 	return 0;
 }
 
@@ -241,7 +246,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);
 	}
 }