uml: simplify helper stack handling

run_helper and run_helper_thread had arguments which were the same in all
callers.  run_helper's stack_out was always NULL and run_helper_thread's
stack_order was always 0.  These are now gone, and the constants folded
into the code.

Also fixed leaks of the helper stack in the AIO and SIGIO code.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

7 files changed, 7 insertions, 7 deletions

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 8b81bd5f20f2..4d438f36ea2e 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -161,7 +161,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out,
          * problem with /dev/net/tun, which if held open by this
          * thread, prevents the TUN/TAP device from being reused.
          */
-        err = run_helper_thread(winch_thread, &data, CLONE_FILES, stack_out, 0);
+        err = run_helper_thread(winch_thread, &data, CLONE_FILES, stack_out);
         if(err < 0){
                 printk("fork of winch_thread failed - errno = %d\n", -err);
                 goto out_close;
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 5eeecf8917c3..1171790f742c 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -68,7 +68,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
                 args = pid_args;
         }
 
-        pid = run_helper(pre_exec, &data, args, NULL);
+        pid = run_helper(pre_exec, &data, args);
 
         os_close_file(out_fds[0]);
         os_close_file(in_fds[1]);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 3503cff867c3..6fa948ba969d 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -187,7 +187,7 @@ static int change_tramp(char **argv, char *output, int output_len)
         }
         pe_data.close_me = fds[0];
         pe_data.stdout = fds[1];
-        pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
+        pid = run_helper(change_pre_exec, &pe_data, argv);
 
         if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
                 read_output(fds[0], output, output_len);
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 3f6357d24bee..29250beba429 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -188,7 +188,7 @@ int port_connection(int fd, int *socket, int *pid_out)
                 { .sock_fd              = new,
                   .pipe_fd              = socket[1] });
 
-        err = run_helper(port_pre_exec, &data, argv, NULL);
+        err = run_helper(port_pre_exec, &data, argv);
         if(err < 0)
                 goto out_shutdown;
 
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 78f0e515da8f..edc2de3ee2f4 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -85,7 +85,7 @@ static int slip_tramp(char **argv, int fd)
         pe_data.stdin = fd;
         pe_data.stdout = fds[1];
         pe_data.close_me = fds[0];
-        err = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        err = run_helper(slip_pre_exec, &pe_data, argv);
         if(err < 0)
                 goto out_close;
         pid = err;
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 39f889fe9949..0e462f64f227 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -42,7 +42,7 @@ static int slirp_tramp(char **argv, int fd)
 
         pe_data.stdin = fd;
         pe_data.stdout = fd;
-        pid = run_helper(slirp_pre_exec, &pe_data, argv, NULL);
+        pid = run_helper(slirp_pre_exec, &pe_data, argv);
 
         return(pid);
 }
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 35912846ed21..fd817e541543 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -132,7 +132,7 @@ static int xterm_open(int input, int output, int primary, void *d,
         }
 
         sprintf(title, data->title, data->device);
-        pid = run_helper(NULL, NULL, argv, NULL);
+        pid = run_helper(NULL, NULL, argv);
         if (pid < 0) {
                 err = pid;
                 printk(UM_KERN_ERR "xterm_open : run_helper failed, "