Author: glebius
Date: Thu Sep 4 19:27:30 2014
New Revision: 271122
URL: http://svnweb.freebsd.org/changeset/base/271122
Log:
Change a very strange code in m_demote() to simple assertion.
Sponsored by: Nginx, Inc.
Modified:
head/sys/kern/uipc_mbuf.c
Modified: head/sys/kern/uipc_mbuf.c
==============================================================================
--- head/sys/kern/uipc_mbuf.c Thu Sep 4 19:22:01 2014 (r271121)
+++ head/sys/kern/uipc_mbuf.c Thu Sep 4 19:27:30 2014 (r271122)
@@ -393,17 +393,13 @@ m_demote(struct mbuf *m0, int all)
struct mbuf *m;
for (m = all ? m0 : m0->m_next; m != NULL; m = m->m_next) {
+ KASSERT(m->m_nextpkt == NULL, ("%s: m_nextpkt in m %p, m0 %p",
+ __func__, m, m0));
if (m->m_flags & M_PKTHDR) {
m_tag_delete_chain(m, NULL);
m->m_flags &= ~M_PKTHDR;
bzero(&m->m_pkthdr, sizeof(struct pkthdr));
}
- if (m != m0 && m->m_nextpkt != NULL) {
- KASSERT(m->m_nextpkt == NULL,
- ("%s: m_nextpkt not NULL", __func__));
- m_freem(m->m_nextpkt);
- m->m_nextpkt = NULL;
- }
m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_NOFREE);
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
