D56948.diff
No OneTemporary
Actions

Size

865 B

Referenced Files

None

Subscribers

None

D56948.diff
View Options

	diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
	--- a/sys/kern/vfs_bio.c
	+++ b/sys/kern/vfs_bio.c
	@@ -2053,22 +2053,26 @@
	bp->b_qindex = bq->bq_index;
	bp->b_subqueue = bq->bq_subqueue;

	- /*
	- * Unlock before we notify so that we don't wakeup a waiter that
	- * fails a trylock on the buf and sleeps again.
	- */
	- if (unlock)
	- BUF_UNLOCK(bp);
	-
	if (bp->b_qindex == QUEUE_CLEAN) {
	/*
	* Flush the per-cpu queue and notify any waiters.
	+ *
	+ * Unlock before we notify so that we don't wakeup a waiter
	+ * that fails a trylock on the buf and sleeps again.
	*/
	if (bd->bd_wanted \|\| (bq != bd->bd_cleanq &&
	- bq->bq_len >= bd->bd_lim))
	+ bq->bq_len >= bd->bd_lim)) {
	+ if (unlock) {
	+ BUF_UNLOCK(bp);
	+ unlock = false;
	+ }
	bd_flush(bd, bq);
	+ }
	}
	BQ_UNLOCK(bq);
	+
	+ if (unlock)
	+ BUF_UNLOCK(bp);
	}

	/*