The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fb32c8dbeb6fb0cc01756fb2fb90ca06e4b7c53e
commit fb32c8dbeb6fb0cc01756fb2fb90ca06e4b7c53e Author: Mateusz Guzik <[email protected]> AuthorDate: 2021-06-30 13:09:40 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2021-07-02 08:30:22 +0000 iflib: retire MB_DTOR_SKIP The flag was added in 2016 but remains unused. Reviewed by: kbowling Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D30958 --- sys/kern/kern_mbuf.c | 3 ++- sys/sys/mbuf.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index a46c576bad90..f814d3cab6e8 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -658,7 +658,8 @@ mb_dtor_mbuf(void *mem, int size, void *arg) flags = (unsigned long)arg; KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__)); - if (!(flags & MB_DTOR_SKIP) && (m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags)) + KASSERT((flags & 0x1) == 0, ("%s: obsolete MB_DTOR_SKIP passed", __func__)); + if ((m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags)) m_tag_delete_chain(m, NULL); } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index e37b872c74fe..ffc574817249 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -478,8 +478,6 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) #define M_PROTO10 0x00400000 /* protocol-specific */ #define M_PROTO11 0x00800000 /* protocol-specific */ -#define MB_DTOR_SKIP 0x1 /* don't pollute the cache by touching a freed mbuf */ - /* * Flags to purge when crossing layers. */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
