diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2012-03-23 15:02:47 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:42:15 +0200 |
| commit | 13db73535cc63e0034b901a287cf5bb20919825b (patch) | |
| tree | 15b5941aa09815de95f1cb4bde1deefdb0999136 /kernel | |
| parent | dbd3462bbd6cbdfbe8c9db662b2f2b4a90311db3 (diff) | |
usermodehelper: introduce umh_complete(sub_info)
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>
[dannf: Adjusted to apply to Debian's 2.6.32]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kmod.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index a061472a7c7e..2a27d17b5f4b 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -206,6 +206,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) { @@ -245,7 +250,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; } @@ -280,7 +285,7 @@ static void __call_usermodehelper(struct work_struct *work) /* FALLTHROUGH */ case UMH_WAIT_EXEC: - complete(sub_info->complete); + umh_complete(sub_info); } } |