35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From: Oleg Nesterov <oleg@redhat.com>
|
|
Date: Fri, 23 Mar 2012 15:02:49 -0700
|
|
Subject: [3/5] usermodehelper: ____call_usermodehelper() doesn't need
|
|
do_exit()
|
|
|
|
commit 5b9bd473e3b8a8c6c4ae99be475e6e9b27568555 upstream.
|
|
|
|
Minor cleanup. ____call_usermodehelper() can simply return, no need to
|
|
call do_exit() explicitely.
|
|
|
|
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>
|
|
---
|
|
kernel/kmod.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/kernel/kmod.c b/kernel/kmod.c
|
|
index 8341de9..685b246 100644
|
|
--- a/kernel/kmod.c
|
|
+++ b/kernel/kmod.c
|
|
@@ -188,7 +188,7 @@ static int ____call_usermodehelper(void *data)
|
|
/* Exec failed? */
|
|
fail:
|
|
sub_info->retval = retval;
|
|
- do_exit(0);
|
|
+ return 0;
|
|
}
|
|
|
|
void call_usermodehelper_freeinfo(struct subprocess_info *info)
|