svn commit: r185146 - user/kmacy/HEAD_fast_multi_xmit/sys/sys

[Kip Macy]

Author: kmacy
Date: Fri Nov 21 04:47:11 2008
New Revision: 185146
URL: http://svn.freebsd.org/changeset/base/185146

Log:
  generalize sanity check in buf_ring_peek to multi-consumer case

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h	Fri Nov 21 04:45:53 2008	(r185145)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/sys/buf_ring.h	Fri Nov 21 04:47:11 2008	(r185146)
@@ -234,7 +234,7 @@ buf_ring_peek(struct buf_ring *br)
 {
 
 #ifdef DEBUG_BUFRING
-	if (!mtx_owned(br->br_lock))
+	if ((br->br_lock != NULL) && !mtx_owned(br->br_lock))
 		panic("lock not held on single consumer dequeue");
 #endif	
 	mb();