From owner-svn-src-head@FreeBSD.ORG  Tue Sep 30 23:16:27 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 945138E7;
 Tue, 30 Sep 2014 23:16:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 8079A260;
 Tue, 30 Sep 2014 23:16:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UNGRAh082396;
 Tue, 30 Sep 2014 23:16:27 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UNGRLf082395;
 Tue, 30 Sep 2014 23:16:27 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201409302316.s8UNGRLf082395@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 30 Sep 2014 23:16:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272336 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 23:16:27 -0000

Author: np
Date: Tue Sep 30 23:16:26 2014
New Revision: 272336
URL: http://svnweb.freebsd.org/changeset/base/272336

Log:
  Test for absence of M_NOFREE before attempting to purge the mbuf's tags.
  This will leave more state intact should the assertion go off.
  
  MFC after:	1 month

Modified:
  head/sys/kern/kern_mbuf.c

Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c	Tue Sep 30 23:16:03 2014	(r272335)
+++ head/sys/kern/kern_mbuf.c	Tue Sep 30 23:16:26 2014	(r272336)
@@ -447,9 +447,9 @@ mb_dtor_mbuf(void *mem, int size, void *
 	m = (struct mbuf *)mem;
 	flags = (unsigned long)arg;
 
+	KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
 	if ((m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags))
 		m_tag_delete_chain(m, NULL);
-	KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
 #ifdef INVARIANTS
 	trash_dtor(mem, size, arg);
 #endif