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

Extend the scope of the vm object lock in swp_pager_async_iodone() to cover

Browse Source 
a vm_page_free().
This commit is contained in:
Alan Cox 2003-06-13 06:17:42 +00:00
parent 8630c1173e
commit 33a609ece0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/vm/swap_pager.c
View File

@ -1485,8 +1485,6 @@ swp_pager_async_iodone(bp)
/*
* set object, raise to splvm().
*/
if (bp->b_npages)
object = bp->b_pages[0]->object;
s = splvm();
/*
@ -1494,6 +1492,10 @@ swp_pager_async_iodone(bp)
*/
pmap_qremove((vm_offset_t)bp->b_data, bp->b_npages);
if (bp->b_npages) {
object = bp->b_pages[0]->object;
VM_OBJECT_LOCK(object);
}
vm_page_lock_queues();
/*
* cleanup pages. If an error occurs writing to swap, we are in
@ -1620,7 +1622,6 @@ swp_pager_async_iodone(bp)
* pip refs on the object.
*/
if (object != NULL) {
VM_OBJECT_LOCK(object);
vm_object_pip_wakeupn(object, bp->b_npages);
VM_OBJECT_UNLOCK(object);
}