D25828.id74980.diff
No OneTemporary
Actions

Size

724 B

Referenced Files

None

Subscribers

None

D25828.id74980.diff
View Options

	Index: sys/vm/vm_page.c
	===================================================================
	--- sys/vm/vm_page.c
	+++ sys/vm/vm_page.c
	@@ -1371,10 +1371,15 @@

	KASSERT(vm_page_none_valid(m), ("page %p is valid", m));
	KASSERT(!pmap_page_is_mapped(m), ("page %p is mapped", m));
	- vm_page_assert_xbusied(m);
	KASSERT(m->object != NULL, ("page %p has no object", m));
	VM_OBJECT_ASSERT_WLOCKED(m->object);

	+ /*
	+ * We may be attempting to free the page as part of the handling for an
	+ * I/O error, in which case the page was xbusied by a different thread.
	+ */
	+ vm_page_xbusy_claim(m);
	+
	/*
	* If someone has wired this page while the object lock
	* was not held, then the thread that unwires is responsible