aboutsummaryrefslogtreecommitdiff
path: root/sys/compat/linux/linux_fork.c
diff options
context:
space:
mode:
authorDmitry Chagin <dchagin@FreeBSD.org>2011-02-12 20:16:25 +0000
committerDmitry Chagin <dchagin@FreeBSD.org>2011-02-12 20:16:25 +0000
commitcfa57401b047cb8a5dbca777348cc5625e47e935 (patch)
tree61ccd06eed6a103ea3e0d569636e9e775e70949c /sys/compat/linux/linux_fork.c
parent9588e04dde2761413436853fd6e6692964f813bd (diff)
Notes
Diffstat (limited to 'sys/compat/linux/linux_fork.c')
-rw-r--r--sys/compat/linux/linux_fork.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 465f07fd41742..ce8f5591528da 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -67,13 +67,9 @@ linux_fork(struct thread *td, struct linux_fork_args *args)
if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0)
return (error);
- if (error == 0) {
- td->td_retval[0] = p2->p_pid;
- td->td_retval[1] = 0;
- }
+ td->td_retval[0] = p2->p_pid;
+ td->td_retval[1] = 0;
- if (td->td_retval[1] == 1)
- td->td_retval[0] = 0;
error = linux_proc_init(td, td->td_retval[0], 0);
if (error)
return (error);
@@ -106,13 +102,10 @@ linux_vfork(struct thread *td, struct linux_vfork_args *args)
/* Exclude RFPPWAIT */
if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0)
return (error);
- if (error == 0) {
- td->td_retval[0] = p2->p_pid;
- td->td_retval[1] = 0;
- }
- /* Are we the child? */
- if (td->td_retval[1] == 1)
- td->td_retval[0] = 0;
+
+ td->td_retval[0] = p2->p_pid;
+ td->td_retval[1] = 0;
+
error = linux_proc_init(td, td->td_retval[0], 0);
if (error)
return (error);