From owner-svn-src-all@freebsd.org  Fri Dec  2 15:38:35 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD9DCC63872;
 Fri,  2 Dec 2016 15:38:35 +0000 (UTC)
 (envelope-from rstone@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D631129D;
 Fri,  2 Dec 2016 15:38:35 +0000 (UTC)
 (envelope-from rstone@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB2FcYma083893;
 Fri, 2 Dec 2016 15:38:34 GMT (envelope-from rstone@FreeBSD.org)
Received: (from rstone@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB2FcYRM083892;
 Fri, 2 Dec 2016 15:38:34 GMT (envelope-from rstone@FreeBSD.org)
Message-Id: <201612021538.uB2FcYRM083892@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rstone set sender to
 rstone@FreeBSD.org using -f
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 2 Dec 2016 15:38:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309414 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2016 15:38:35 -0000

Author: rstone
Date: Fri Dec  2 15:38:34 2016
New Revision: 309414
URL: https://svnweb.freebsd.org/changeset/base/309414

Log:
  Revert r309372
  
  The bug intended to be fixed by r309372 was already addressed by r296178,
  so revert my change.
  
  Reported by:	seph

Modified:
  head/sys/sys/buf_ring.h

Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h	Fri Dec  2 14:44:45 2016	(r309413)
+++ head/sys/sys/buf_ring.h	Fri Dec  2 15:38:34 2016	(r309414)
@@ -67,13 +67,11 @@ buf_ring_enqueue(struct buf_ring *br, vo
 	uint32_t prod_head, prod_next, cons_tail;
 #ifdef DEBUG_BUFRING
 	int i;
-	if (br->br_cons_head != br->br_prod_head) {
-		for (i = (br->br_cons_head + 1) & br->br_cons_mask; i != br->br_prod_head;
-		    i = ((i + 1) & br->br_cons_mask))
-			if(br->br_ring[i] == buf)
-				panic("buf=%p already enqueue at %d prod=%d cons=%d",
-				    buf, i, br->br_prod_tail, br->br_cons_tail);
-	}
+	for (i = br->br_cons_head; i != br->br_prod_head;
+	     i = ((i + 1) & br->br_cons_mask))
+		if(br->br_ring[i] == buf)
+			panic("buf=%p already enqueue at %d prod=%d cons=%d",
+			    buf, i, br->br_prod_tail, br->br_cons_tail);
 #endif	
 	critical_enter();
 	do {