D13681.id37190.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13681.id37190.diff
View Options

	Index: sys/vm/vm_swapout.c
	===================================================================
	--- sys/vm/vm_swapout.c
	+++ sys/vm/vm_swapout.c
	@@ -764,22 +764,13 @@
	sx_sunlock(&allproc_lock);

	/*
	- * Do not swapout a process that
	- * is waiting for VM data
	- * structures as there is a possible
	- * deadlock. Test this first as
	- * this may block.
	- *
	- * Lock the map until swapout
	- * finishes, or a thread of this
	- * process may attempt to alter
	- * the map.
	+ * Do not swapout a process that is waiting for VM
	+ * data structures as there is a possible deadlock.
	+ * Test this first as this may block.
	*/
	vm = vmspace_acquire_ref(p);
	if (vm == NULL)
	goto nextproc2;
	- if (!vm_map_trylock(&vm->vm_map))
	- goto nextproc1;

	PROC_LOCK(p);
	if (p->p_lock != 1 \|\| (p->p_flag & (P_STOPPED_SINGLE \|
	@@ -867,15 +858,12 @@
	if (swapout(p) == 0)
	didswap = true;
	PROC_UNLOCK(p);
	- vm_map_unlock(&vm->vm_map);
	vmspace_free(vm);
	goto retry;
	}
	}
	nextproc:
	PROC_UNLOCK(p);
	- vm_map_unlock(&vm->vm_map);
	-nextproc1:
	vmspace_free(vm);
	nextproc2:
	sx_slock(&allproc_lock);