lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: code convention cleanup of a file

Browse Source 
Fix coding conventions violations is arch/um/os-Linux/helper.c.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso
2006-10-19 23:28:21 -07:00
committed by Linus Torvalds
parent c13e569073
commit 8b028bcd0e
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/um/os-Linux/helper.c
View File

@@ -46,7 +46,7 @@ static int helper_child(void *arg)
printk("helper_child - execve 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)); os_write_file(data->fd, &errval, sizeof(errval));
kill(os_getpid(), SIGKILL); kill(os_getpid(), SIGKILL);
return(0); return 0;
} }
/* Returns either the pid of the child process we run or -E* on failure. /* Returns either the pid of the child process we run or -E* on failure.
@@ -60,7 +60,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
if ((stack_out != NULL) && (*stack_out != 0)) if ((stack_out != NULL) && (*stack_out != 0))
stack = *stack_out; stack = *stack_out;
else stack = alloc_stack(0, __cant_sleep()); else
stack = alloc_stack(0, __cant_sleep());
if (stack == 0) if (stack == 0)
return -ENOMEM; return -ENOMEM;
@@ -95,9 +96,9 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
/* Read the errno value from the child, if the exec failed, or get 0 if /* 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. */ * the exec succeeded because the pipe fd was set as close-on-exec. */
n = os_read_file(fds[0], &ret, sizeof(ret)); n = os_read_file(fds[0], &ret, sizeof(ret));
if(n == 0) if (n == 0) {
ret = pid; ret = pid;
else { } else {
if (n < 0) { if (n < 0) {
printk("run_helper : read on pipe failed, ret = %d\n", printk("run_helper : read on pipe failed, ret = %d\n",
-n); -n);
@@ -114,8 +115,9 @@ out_close:
out_free: out_free:
if (stack_out == NULL) if (stack_out == NULL)
free_stack(stack, 0); free_stack(stack, 0);
else *stack_out = stack; else
return(ret); *stack_out = stack;
return ret;
} }
int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
@@ -125,7 +127,8 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
int pid, status, err; int pid, status, err;
stack = alloc_stack(stack_order, __cant_sleep()); stack = alloc_stack(stack_order, __cant_sleep());
if(stack == 0) return(-ENOMEM); if (stack == 0)
return -ENOMEM;
sp = stack + (page_size() << stack_order) - sizeof(void *); sp = stack + (page_size() << stack_order) - sizeof(void *);
pid = clone(proc, (void *) sp, flags | SIGCHLD, arg); pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);
@@ -147,9 +150,9 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
printk("run_helper_thread - thread returned status " printk("run_helper_thread - thread returned status "
"0x%x\n", status); "0x%x\n", status);
free_stack(stack, stack_order); free_stack(stack, stack_order);
} } else
else *stack_out = stack; *stack_out = stack;
return(pid); return pid;
} }
int helper_wait(int pid) int helper_wait(int pid)
@@ -161,5 +164,5 @@ int helper_wait(int pid)
ret = -errno; ret = -errno;
printk("helper_wait : waitpid failed, errno = %d\n", errno); printk("helper_wait : waitpid failed, errno = %d\n", errno);
} }
return(ret); return ret;
} }