D30220.id89053.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30220.id89053.diff
View Options

	Index: sys/kern/kern_fork.c
	===================================================================
	--- sys/kern/kern_fork.c
	+++ sys/kern/kern_fork.c
	@@ -313,8 +313,8 @@
	("fork_norfproc called with RFPROC set"));
	p1 = td->td_proc;

	- if (((p1->p_flag & (P_HADTHREADS\|P_SYSTEM)) == P_HADTHREADS) &&
	- (flags & (RFCFDG \| RFFDG))) {
	+ if ((p1->p_flag & (P_HADTHREADS \| P_SYSTEM)) == P_HADTHREADS &&
	+ ((flags & (RFCFDG \| RFFDG)) != 0 \|\| (flags & RFMEM) == 0)) {
	PROC_LOCK(p1);
	if (thread_single(p1, SINGLE_BOUNDARY)) {
	PROC_UNLOCK(p1);
	@@ -350,8 +350,8 @@
	}

	fail:
	- if (((p1->p_flag & (P_HADTHREADS\|P_SYSTEM)) == P_HADTHREADS) &&
	- (flags & (RFCFDG \| RFFDG))) {
	+ if ((p1->p_flag & (P_HADTHREADS \| P_SYSTEM)) == P_HADTHREADS &&
	+ ((flags & (RFCFDG \| RFFDG)) != 0 \|\| (flags & RFMEM) == 0)) {
	PROC_LOCK(p1);
	thread_single_end(p1, SINGLE_BOUNDARY);
	PROC_UNLOCK(p1);
	Index: sys/vm/vm_glue.c
	===================================================================
	--- sys/vm/vm_glue.c
	+++ sys/vm/vm_glue.c
	@@ -553,11 +553,9 @@
	* COW locally.
	*/
	if ((flags & RFMEM) == 0) {
	- if (refcount_load(&p1->p_vmspace->vm_refcnt) > 1) {
	- error = vmspace_unshare(p1);
	- if (error)
	- return (error);
	- }
	+ error = vmspace_unshare(p1);
	+ if (error)
	+ return (error);
	}
	cpu_fork(td, p2, td2, flags);
	return (0);