Date: Fri, 2 Dec 2016 15:38:34 +0000 (UTC) From: Ryan Stone <rstone@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309414 - head/sys/sys Message-ID: <201612021538.uB2FcYRM083892@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612021538.uB2FcYRM083892>