Module Name: src
Committed By: maxv
Date: Fri Apr 27 16:18:40 UTC 2018
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
Stop passing the pool as argument of the storage. M_EXT_CLUSTER mbufs
are supposed to take their area from mcl_cache only.
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/kern/uipc_mbuf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.206 src/sys/kern/uipc_mbuf.c:1.207
--- src/sys/kern/uipc_mbuf.c:1.206 Fri Apr 27 09:22:28 2018
+++ src/sys/kern/uipc_mbuf.c Fri Apr 27 16:18:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.206 2018/04/27 09:22:28 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.207 2018/04/27 16:18:40 maxv Exp $ */
/*
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.206 2018/04/27 09:22:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.207 2018/04/27 16:18:40 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -591,7 +591,7 @@ m_clget(struct mbuf *m, int nowait)
m->m_ext.ext_flags = 0;
m->m_ext.ext_size = MCLBYTES;
m->m_ext.ext_free = NULL;
- m->m_ext.ext_arg = mcl_cache;
+ m->m_ext.ext_arg = NULL;
/* ext_paddr initialized above */
mowner_ref(m, M_EXT|M_EXT_CLUSTER);
@@ -1932,8 +1932,7 @@ m_ext_free(struct mbuf *m)
m_ext_free(m->m_ext_ref);
m->m_ext_ref = m;
} else if ((m->m_flags & M_EXT_CLUSTER) != 0) {
- pool_cache_put_paddr((struct pool_cache *)
- m->m_ext.ext_arg,
+ pool_cache_put_paddr(mcl_cache,
m->m_ext.ext_buf, m->m_ext.ext_paddr);
} else if (m->m_ext.ext_free) {
(*m->m_ext.ext_free)(m,
