From owner-p4-projects@FreeBSD.ORG  Mon Sep 24 04:54:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8390816A419; Mon, 24 Sep 2007 04:54:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59ED216A417
	for <perforce@freebsd.org>; Mon, 24 Sep 2007 04:54:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 323A813C45D
	for <perforce@freebsd.org>; Mon, 24 Sep 2007 04:54:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8O4s9bw090395
	for <perforce@freebsd.org>; Mon, 24 Sep 2007 04:54:09 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8O4s9Sw090390
	for perforce@freebsd.org; Mon, 24 Sep 2007 04:54:09 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 24 Sep 2007 04:54:09 GMT
Message-Id: <200709240454.l8O4s9Sw090390@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126760 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Sep 2007 04:54:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=126760

Change 126760 by kmacy@kmacy_home:ethng on 2007/09/24 04:54:01

	- we should never make it as far as the dtor if the memory is allocated from
	  another zone, but a KASSERT that this isn't an embedded mbuf just in case
	- initialize ref_cnt packet zone ctor

Affected files ...

.. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#7 edit

Differences ...

==== //depot/projects/ethng/src/sys/kern/kern_mbuf.c#7 (text+ko) ====

@@ -355,6 +355,7 @@
 	if ((flags & MB_NOTAGS) == 0 && (m->m_flags & M_PKTHDR) != 0)
 		m_tag_delete_chain(m, NULL);
 	KASSERT((m->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__));
+	KASSERT((m->m_flags & M_NOFREE) == 0, ("freeing embedded mbuf"));
 #ifdef INVARIANTS
 	trash_dtor(mem, size, arg);
 #endif
@@ -534,7 +535,8 @@
 	m->m_len = 0;
 	m->m_flags = (flags | M_EXT);
 	m->m_type = type;
-
+	m->m_ext.ref_cnt = NULL; /* lazy refcnt */
+	
 	if (flags & M_PKTHDR) {
 		m->m_pkthdr.rcvif = NULL;
 		m->m_pkthdr.len = 0;