git: 0a718a6e6eba - main - mbuf: replace all direct uma_zfree(zone_mbuf) calls with m_free_raw

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a718a6e6ebaa1b8442123df8bdbae5a04a77987

commit 0a718a6e6ebaa1b8442123df8bdbae5a04a77987
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-06 16:44:35 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-07 11:05:46 +0000

    mbuf: replace all direct uma_zfree(zone_mbuf) calls with m_free_raw
    
    Reviewed by:    donner
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D31082
---
 sys/kern/kern_mbuf.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 2333bf887354..c43f086bb83f 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -1191,19 +1191,19 @@ mb_free_ext(struct mbuf *m)
 			break;
 		case EXT_CLUSTER:
 			uma_zfree(zone_clust, m->m_ext.ext_buf);
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 			break;
 		case EXT_JUMBOP:
 			uma_zfree(zone_jumbop, m->m_ext.ext_buf);
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 			break;
 		case EXT_JUMBO9:
 			uma_zfree(zone_jumbo9, m->m_ext.ext_buf);
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 			break;
 		case EXT_JUMBO16:
 			uma_zfree(zone_jumbo16, m->m_ext.ext_buf);
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 			break;
 		case EXT_SFBUF:
 		case EXT_NET_DRV:
@@ -1212,7 +1212,7 @@ mb_free_ext(struct mbuf *m)
 			KASSERT(mref->m_ext.ext_free != NULL,
 			    ("%s: ext_free not set", __func__));
 			mref->m_ext.ext_free(mref);
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 			break;
 		case EXT_EXTREF:
 			KASSERT(m->m_ext.ext_free != NULL,
@@ -1230,7 +1230,7 @@ mb_free_ext(struct mbuf *m)
 	}
 
 	if (freembuf && m != mref)
-		uma_zfree(zone_mbuf, m);
+		m_free_raw(m);
 }
 
 /*
@@ -1268,11 +1268,11 @@ mb_free_extpg(struct mbuf *m)
 			ktls_enqueue_to_free(mref);
 		else
 #endif
-			uma_zfree(zone_mbuf, mref);
+			m_free_raw(mref);
 	}
 
 	if (m != mref)
-		uma_zfree(zone_mbuf, m);
+		m_free_raw(m);
 }
 
 /*
@@ -1364,7 +1364,7 @@ m_get2(int size, int how, short type, int flags)
 
 	n = uma_zalloc_arg(zone_jumbop, m, how);
 	if (n == NULL) {
-		uma_zfree(zone_mbuf, m);
+		m_free_raw(m);
 		return (NULL);
 	}
 
@@ -1395,7 +1395,7 @@ m_getjcl(int how, short type, int flags, int size)
 	zone = m_getzone(size);
 	n = uma_zalloc_arg(zone, m, how);
 	if (n == NULL) {
-		uma_zfree(zone_mbuf, m);
+		m_free_raw(m);
 		return (NULL);
 	}
 	MBUF_PROBE5(m__getjcl, how, type, flags, size, m);