VisionFive2 Linux kernel

author: Lucas De Marchi <lucas.demarchi@profusion.mobi> 2013-04-30 15:28:07 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2013-04-30 17:04:06 -0700 commit: 907ed1328d2a748f3d6028503d3e04c74ea62730 parent: fb96c475f6b27bd2c7f6fe0720e6972909a203ca

Commit Summary:

usermodehelper: split remaining calls to call_usermodehelper_fns()

Diffstat:

1 file changed, 9 insertions, 3 deletions

diff --git a/fs/coredump.c b/fs/coredump.c
index 7dfb3b062e24..d52f6bd5ad8e 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -525,6 +525,7 @@ void do_coredump(siginfo_t *siginfo)
 	if (ispipe) {
 		int dump_count;
 		char **helper_argv;
+		struct subprocess_info *sub_info;
 
 		if (ispipe < 0) {
 			printk(KERN_WARNING "format_corename failed\n");
@@ -571,9 +572,14 @@ void do_coredump(siginfo_t *siginfo)
 			goto fail_dropcount;
 		}
 
-		retval = call_usermodehelper_fns(helper_argv[0], helper_argv,
-					NULL, UMH_WAIT_EXEC, umh_pipe_setup,
-					NULL, &cprm);
+		retval = -ENOMEM;
+		sub_info = call_usermodehelper_setup(helper_argv[0],
+						helper_argv, NULL, GFP_KERNEL,
+						umh_pipe_setup, NULL, &cprm);
+		if (sub_info)
+			retval = call_usermodehelper_exec(sub_info,
+							  UMH_WAIT_EXEC);
+
 		argv_free(helper_argv);
 		if (retval) {
 			printk(KERN_INFO "Core dump to %s pipe failed\n",