svn commit: r272336 - head/sys/kern

[Navdeep Parhar]

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