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

o Convert two instances of vm_page_sleep_busy() to vm_page_sleep_if_busy()

Browse Source 
with appropriate page queue locking.
This commit is contained in:
Alan Cox 2002-08-03 18:59:19 +00:00
parent 9bb322433e
commit 3327872297
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/vfs_bio.c
View File

@ -2640,6 +2640,7 @@ allocbuf(struct buf *bp, int size)
* if we have to remove any pages. * if we have to remove any pages.
*/ */
if (desiredpages < bp->b_npages) { if (desiredpages < bp->b_npages) {
vm_page_lock_queues();
for (i = desiredpages; i < bp->b_npages; i++) { for (i = desiredpages; i < bp->b_npages; i++) {
/* /*
* the page is not freed here -- it * the page is not freed here -- it
@ -2649,14 +2650,13 @@ allocbuf(struct buf *bp, int size)
m = bp->b_pages[i]; m = bp->b_pages[i];
KASSERT(m != bogus_page, KASSERT(m != bogus_page,
("allocbuf: bogus page found")); ("allocbuf: bogus page found"));
while (vm_page_sleep_busy(m, TRUE, "biodep")) while (vm_page_sleep_if_busy(m, TRUE, "biodep"))
; vm_page_lock_queues();
bp->b_pages[i] = NULL; bp->b_pages[i] = NULL;
vm_page_lock_queues();
vm_page_unwire(m, 0); vm_page_unwire(m, 0);
vm_page_unlock_queues();
} }
vm_page_unlock_queues();
pmap_qremove((vm_offset_t) trunc_page((vm_offset_t)bp->b_data) + pmap_qremove((vm_offset_t) trunc_page((vm_offset_t)bp->b_data) +
(desiredpages << PAGE_SHIFT), (bp->b_npages - desiredpages)); (desiredpages << PAGE_SHIFT), (bp->b_npages - desiredpages));
bp->b_npages = desiredpages; bp->b_npages = desiredpages;
@ -2720,8 +2720,8 @@ allocbuf(struct buf *bp, int size)
* vm_fault->getpages->cluster_read->allocbuf * vm_fault->getpages->cluster_read->allocbuf
* *
*/ */
vm_page_lock_queues();
if (vm_page_sleep_busy(m, FALSE, "pgtblk")) if (vm_page_sleep_if_busy(m, FALSE, "pgtblk"))
continue; continue;
/* /*
@ -2734,7 +2734,6 @@ allocbuf(struct buf *bp, int size)
(cnt.v_free_min + cnt.v_cache_min))) { (cnt.v_free_min + cnt.v_cache_min))) {
pagedaemon_wakeup(); pagedaemon_wakeup();
} }
vm_page_lock_queues();
vm_page_flag_clear(m, PG_ZERO); vm_page_flag_clear(m, PG_ZERO);
vm_page_wire(m); vm_page_wire(m);
vm_page_unlock_queues(); vm_page_unlock_queues();