svn commit: r254736 - user/np/cxl_tuning/sys/sys

[Navdeep Parhar]

Author: np
Date: Fri Aug 23 20:37:44 2013
New Revision: 254736
URL: http://svnweb.freebsd.org/changeset/base/254736

Log:
  Don't leak tags when M_NOFREE | M_PKTHDR mbufs are freed.

Modified:
  user/np/cxl_tuning/sys/sys/mbuf.h

Modified: user/np/cxl_tuning/sys/sys/mbuf.h
==============================================================================
--- user/np/cxl_tuning/sys/sys/mbuf.h	Fri Aug 23 19:12:29 2013	(r254735)
+++ user/np/cxl_tuning/sys/sys/mbuf.h	Fri Aug 23 20:37:44 2013	(r254736)
@@ -530,18 +530,6 @@ m_free_fast(struct mbuf *m)
 	uma_zfree_arg(zone_mbuf, m, (void *)MB_NOTAGS);
 }
 
-static __inline struct mbuf *
-m_free(struct mbuf *m)
-{
-	struct mbuf *n = m->m_next;
-
-	if (m->m_flags & M_EXT)
-		mb_free_ext(m);
-	else if ((m->m_flags & M_NOFREE) == 0)
-		uma_zfree(zone_mbuf, m);
-	return (n);
-}
-
 static __inline void
 m_clget(struct mbuf *m, int how)
 {
@@ -1000,6 +988,20 @@ m_tag_find(struct mbuf *m, int type, str
 	    m_tag_locate(m, MTAG_ABI_COMPAT, type, start));
 }
 
+static __inline struct mbuf *
+m_free(struct mbuf *m)
+{
+	struct mbuf *n = m->m_next;
+
+	if ((m->m_flags & (M_PKTHDR|M_NOFREE)) == (M_PKTHDR|M_NOFREE))
+		m_tag_delete_chain(m, NULL);
+	if (m->m_flags & M_EXT)
+		mb_free_ext(m);
+	else if ((m->m_flags & M_NOFREE) == 0)
+		uma_zfree(zone_mbuf, m);
+	return (n);
+}
+
 static int inline
 rt_m_getfib(struct mbuf *m)
 {