diff options
| author | kib <kib@FreeBSD.org> | 2015-06-23 06:12:14 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-06-23 06:12:14 +0000 |
| commit | 1420f5dc45b5050a921603332133dce964cdd3a5 (patch) | |
| tree | edb49987c271ae2c36a29e9e8f58d496aa026120 /sys/kern | |
| parent | f23699830b14f9be1854058af550b217fe0c5f3e (diff) | |
| download | FreeBSD-src-1420f5dc45b5050a921603332133dce964cdd3a5.zip FreeBSD-src-1420f5dc45b5050a921603332133dce964cdd3a5.tar.gz | |
Only take previous buffer queue lock (olock) when needed for REMFREE
in binsfree().
Submitted by: Conrad Meyer
Sponsored by: EMC / Isilon Storage Division
Review: https://reviews.freebsd.org/D2882
MFC after: 1 week
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_bio.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 5ac04ac..c715725 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -994,21 +994,23 @@ binsfree(struct buf *bp, int qindex) BUF_ASSERT_XLOCKED(bp); - olock = bqlock(bp->b_qindex); nlock = bqlock(qindex); - mtx_lock(olock); /* Handle delayed bremfree() processing. */ - if (bp->b_flags & B_REMFREE) + if (bp->b_flags & B_REMFREE) { + olock = bqlock(bp->b_qindex); + mtx_lock(olock); bremfreel(bp); + if (olock != nlock) { + mtx_unlock(olock); + mtx_lock(nlock); + } + } else + mtx_lock(nlock); if (bp->b_qindex != QUEUE_NONE) panic("binsfree: free buffer onto another queue???"); bp->b_qindex = qindex; - if (olock != nlock) { - mtx_unlock(olock); - mtx_lock(nlock); - } if (bp->b_flags & B_AGE) TAILQ_INSERT_HEAD(&bufqueues[bp->b_qindex], bp, b_freelist); else |
