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

Do not call bremfree for managed buffers.

Browse Source 
Calling bremfree for these buffers results in panic:
"bremfree: buffer %p not on a queue."

Approved by: kib
This commit is contained in:
gber 2012-05-15 09:55:15 +00:00
parent eceb1cf926
commit 112a2e964f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_bio.c
View File

@ -2640,8 +2640,8 @@ loop:
if (bp != NULL) {
int lockflags;
/*
* Buffer is in-core. If the buffer is not busy, it must
* be on a queue.
* Buffer is in-core. If the buffer is not busy nor managed,
* it must be on a queue.
*/
lockflags = LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK;
@ -2671,9 +2671,13 @@ loop:
bp->b_flags &= ~B_CACHE;
else if ((bp->b_flags & (B_VMIO | B_INVAL)) == 0)
bp->b_flags |= B_CACHE;
BO_LOCK(bo);
bremfree(bp);
BO_UNLOCK(bo);
if (bp->b_flags & B_MANAGED)
MPASS(bp->b_qindex == QUEUE_NONE);
else {
BO_LOCK(bo);
bremfree(bp);
BO_UNLOCK(bo);
}
/*
* check for size inconsistancies for non-VMIO case.