kmod: convert two call sites to call_usermodehelper_fns()

Both kernel/sys.c && security/keys/request_key.c where inlining the exact
same code as call_usermodehelper_fns(); So simply convert these sites to
directly use call_usermodehelper_fns().

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 10 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index cc3790315d2..000e7501752 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -93,16 +93,9 @@ static void umh_keys_cleanup(struct subprocess_info *info)
 static int call_usermodehelper_keys(char *path, char **argv, char **envp,
                                         struct key *session_keyring, int wait)
 {
-        gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
-        struct subprocess_info *info =
-                call_usermodehelper_setup(path, argv, envp, gfp_mask);
-
-        if (!info)
-                return -ENOMEM;
-
-        call_usermodehelper_setfns(info, umh_keys_init, umh_keys_cleanup,
-                                        key_get(session_keyring));
-        return call_usermodehelper_exec(info, wait);
+        return call_usermodehelper_fns(path, argv, envp, wait,
+                                       umh_keys_init, umh_keys_cleanup,
+                                       key_get(session_keyring));
 }
 
 /*