diff options
| author | Alan Cox <alc@FreeBSD.org> | 2003-06-03 19:37:01 +0000 |
|---|---|---|
| committer | Alan Cox <alc@FreeBSD.org> | 2003-06-03 19:37:01 +0000 |
| commit | bdbfbaafcc1d9e5b84b2480bb930127ded926d6f (patch) | |
| tree | 0a01a3263ab776156a365a2a2b8fedbac45ed6c4 | |
| parent | 479728fd77f281405ca2dd59d20203dfe63d3e62 (diff) | |
Notes
| -rw-r--r-- | sys/vm/vm_object.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 63166ee2b318..18db92561747 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1774,17 +1774,21 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, if (prev_object == NULL) return (TRUE); - vm_object_lock(prev_object); + mtx_lock(&Giant); + VM_OBJECT_LOCK(prev_object); if (prev_object->type != OBJT_DEFAULT && prev_object->type != OBJT_SWAP) { - vm_object_unlock(prev_object); + VM_OBJECT_UNLOCK(prev_object); + mtx_unlock(&Giant); return (FALSE); } /* * Try to collapse the object first */ + VM_OBJECT_UNLOCK(prev_object); vm_object_collapse(prev_object); + VM_OBJECT_LOCK(prev_object); /* * Can't coalesce if: . more than one reference . paged out . shadows @@ -1792,7 +1796,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, * pages not mapped to prev_entry may be in use anyway) */ if (prev_object->backing_object != NULL) { - vm_object_unlock(prev_object); + VM_OBJECT_UNLOCK(prev_object); + mtx_unlock(&Giant); return (FALSE); } @@ -1802,7 +1807,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, if ((prev_object->ref_count > 1) && (prev_object->size != next_pindex)) { - vm_object_unlock(prev_object); + VM_OBJECT_UNLOCK(prev_object); + mtx_unlock(&Giant); return (FALSE); } @@ -1811,14 +1817,12 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, * deallocation. */ if (next_pindex < prev_object->size) { - VM_OBJECT_LOCK(prev_object); vm_object_page_remove(prev_object, next_pindex, next_pindex + next_size, FALSE); if (prev_object->type == OBJT_SWAP) swap_pager_freespace(prev_object, next_pindex, next_size); - VM_OBJECT_UNLOCK(prev_object); } /* @@ -1827,7 +1831,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, if (next_pindex + next_size > prev_object->size) prev_object->size = next_pindex + next_size; - vm_object_unlock(prev_object); + VM_OBJECT_UNLOCK(prev_object); + mtx_unlock(&Giant); return (TRUE); } |