D21357.id61091.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21357.id61091.diff
View Options

	Index: sys/vm/vm_object.c
	===================================================================
	--- sys/vm/vm_object.c
	+++ sys/vm/vm_object.c
	@@ -752,30 +752,10 @@
	/*
	* Make sure no one uses us.
	*/
	+ KASSERT((object->flags & OBJ_DEAD) == 0 \|\| object->type == OBJT_VNODE,
	+ ("double-terminating obj %p", object));
	vm_object_set_flag(object, OBJ_DEAD);

	- /*
	- * Clean and free the pages, as appropriate. All references to the
	- * object are gone, so we don't need to lock it.
	- */
	- if (object->type == OBJT_VNODE) {
	- struct vnode vp = (struct vnode )object->handle;
	-
	- /*
	- * Clean pages and flush buffers.
	- */
	- vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
	- VM_OBJECT_WUNLOCK(object);
	-
	- vinvalbuf(vp, V_SAVE, 0, 0);
	-
	- BO_LOCK(&vp->v_bufobj);
	- vp->v_bufobj.bo_flag \|= BO_DEAD;
	- BO_UNLOCK(&vp->v_bufobj);
	-
	- VM_OBJECT_WLOCK(object);
	- }
	-
	/*
	* wait for the pageout daemon to be done with the object
	*/
	Index: sys/vm/vnode_pager.c
	===================================================================
	--- sys/vm/vnode_pager.c
	+++ sys/vm/vnode_pager.c
	@@ -200,6 +200,21 @@
	* don't double-terminate the object
	*/
	if ((obj->flags & OBJ_DEAD) == 0) {
	+ vm_object_set_flag(obj, OBJ_DEAD);
	+
	+ /*
	+ * Clean pages and flush buffers.
	+ */
	+ vm_object_page_clean(obj, 0, 0, OBJPC_SYNC);
	+ VM_OBJECT_WUNLOCK(obj);
	+
	+ vinvalbuf(vp, V_SAVE, 0, 0);
	+
	+ BO_LOCK(&vp->v_bufobj);
	+ vp->v_bufobj.bo_flag \|= BO_DEAD;
	+ BO_UNLOCK(&vp->v_bufobj);
	+
	+ VM_OBJECT_WLOCK(obj);
	vm_object_terminate(obj);
	} else {
	/*