Pull bugzilla-5452 into release branch

[pandora-kernel.git] / arch / um / os-Linux / helper.c

diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 36cc847..6987d1d 100644 (file)
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -43,7 +43,7 @@ static int helper_child(void *arg)
                (*data->pre_exec)(data->pre_data);
        execvp(argv[0], argv);
        errval = errno;
-       printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
+       printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno);
        os_write_file(data->fd, &errval, sizeof(errval));
        kill(os_getpid(), SIGKILL);
        return(0);
@@ -60,7 +60,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
 
        if((stack_out != NULL) && (*stack_out != 0))
                stack = *stack_out;
-       else stack = alloc_stack(0, um_in_interrupt());
+       else stack = alloc_stack(0, __cant_sleep());
        if(stack == 0)
                return(-ENOMEM);
 
@@ -92,15 +92,15 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
        close(fds[1]);
        fds[1] = -1;
 
-       /*Read the errno value from the child.*/
+       /* Read the errno value from the child, if the exec failed, or get 0 if
+        * the exec succeeded because the pipe fd was set as close-on-exec. */
        n = os_read_file(fds[0], &ret, sizeof(ret));
-       if(n < 0){
+       if (n < 0) {
                printk("run_helper : read on pipe failed, ret = %d\n", -n);
                ret = n;
                kill(pid, SIGKILL);
                CATCH_EINTR(waitpid(pid, NULL, 0));
-       }
-       else if(n != 0){
+       } else if(n != 0){
                CATCH_EINTR(n = waitpid(pid, NULL, 0));
                ret = -errno;
        } else {
@@ -124,7 +124,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
        unsigned long stack, sp;
        int pid, status, err;
 
-       stack = alloc_stack(stack_order, um_in_interrupt());
+       stack = alloc_stack(stack_order, __cant_sleep());
        if(stack == 0) return(-ENOMEM);
 
        sp = stack + (page_size() << stack_order) - sizeof(void *);