d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Assert that the vm_object is locked in vm_object_clear_flag(),

Browse Source 
vm_object_pip_add() and vm_object_pip_wakeup().
 - Remove GIANT_REQUIRED from vm_object_pip_subtract() and
   vm_object_pip_subtract().
 - Lock the vm_object when performing vm_object_page_remove().
This commit is contained in:
Alan Cox 2003-04-21 06:33:52 +00:00
parent 5a882d775d
commit d647a0ed5a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113791
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/vm/vm_object.c
View File

@ -261,7 +261,7 @@ void
vm_object_clear_flag(vm_object_t object, u_short bits)
{
mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED);
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
object->flags &= ~bits;
}
@ -269,14 +269,14 @@ void
vm_object_pip_add(vm_object_t object, short i)
{
mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED);
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
object->paging_in_progress += i;
}
void
vm_object_pip_subtract(vm_object_t object, short i)
{
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
object->paging_in_progress -= i;
}
@ -285,7 +285,7 @@ void
vm_object_pip_wakeup(vm_object_t object)
{
mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED);
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
object->paging_in_progress--;
if ((object->flags & OBJ_PIPWNT) && object->paging_in_progress == 0) {
vm_object_clear_flag(object, OBJ_PIPWNT);
@ -296,7 +296,7 @@ vm_object_pip_wakeup(vm_object_t object)
void
vm_object_pip_wakeupn(vm_object_t object, short i)
{
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
if (i)
object->paging_in_progress -= i;
@ -1797,9 +1797,11 @@ 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);
VM_OBJECT_UNLOCK(prev_object);
if (prev_object->type == OBJT_SWAP)
swap_pager_freespace(prev_object,
next_pindex, next_size);