From owner-svn-src-user@FreeBSD.ORG  Fri Nov 21 04:47:11 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6476C1065672;
	Fri, 21 Nov 2008 04:47:11 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E4FB8FC23;
	Fri, 21 Nov 2008 04:47:11 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAL4lBUq074303;
	Fri, 21 Nov 2008 04:47:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAL4lBuG074302;
	Fri, 21 Nov 2008 04:47:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811210447.mAL4lBuG074302@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 21 Nov 2008 04:47:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185146 - user/kmacy/HEAD_fast_multi_xmit/sys/sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2008 04:47:11 -0000

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();