diff options
| -rw-r--r-- | sys/kern/vfs_default.c | 7 | ||||
| -rw-r--r-- | sys/vm/vm_object.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 58f1a86..556c37e 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -636,9 +636,9 @@ vop_stddestroyvobject(ap) GIANT_REQUIRED; - if (vp->v_object == NULL) + if (obj == NULL) return (0); - + VM_OBJECT_LOCK(obj); if (obj->ref_count == 0) { /* * vclean() may be called twice. The first time @@ -650,7 +650,10 @@ vop_stddestroyvobject(ap) */ if ((obj->flags & OBJ_DEAD) == 0) vm_object_terminate(obj); + else + VM_OBJECT_UNLOCK(obj); } else { + VM_OBJECT_UNLOCK(obj); /* * Woe to the process that tries to page now :-). */ diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 944d033..77c50de 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -502,6 +502,7 @@ vm_object_deallocate(vm_object_t object) return; } doterm: + VM_OBJECT_LOCK(object); temp = object->backing_object; if (temp) { TAILQ_REMOVE(&temp->shadow_head, object, shadow_list); @@ -516,6 +517,8 @@ doterm: */ if ((object->flags & OBJ_DEAD) == 0) vm_object_terminate(object); + else + VM_OBJECT_UNLOCK(object); object = temp; } vm_object_unlock(object); @@ -534,12 +537,11 @@ vm_object_terminate(vm_object_t object) vm_page_t p; int s; - GIANT_REQUIRED; + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); /* * Make sure no one uses us. */ - VM_OBJECT_LOCK(object); vm_object_set_flag(object, OBJ_DEAD); /* |
