Module Name: src
Committed By: maxv
Date: Fri Apr 27 09:22:28 UTC 2018
Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/sys: mbuf.h
Log Message:
Remove _MCLGET, merge its content into m_clget(). The code is slightly
modified to reduce the indentation level.
To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.195 -r1.196 src/sys/sys/mbuf.h
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.205 src/sys/kern/uipc_mbuf.c:1.206
--- src/sys/kern/uipc_mbuf.c:1.205 Fri Apr 27 08:23:18 2018
+++ src/sys/kern/uipc_mbuf.c Fri Apr 27 09:22:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.205 2018/04/27 08:23:18 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.206 2018/04/27 09:22:28 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.205 2018/04/27 08:23:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.206 2018/04/27 09:22:28 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -577,8 +577,24 @@ m_gethdr(int nowait, int type)
void
m_clget(struct mbuf *m, int nowait)
{
+ m->m_ext_storage.ext_buf = (char *)pool_cache_get_paddr(mcl_cache,
+ nowait == M_WAIT ? (PR_WAITOK|PR_LIMITFAIL) : PR_NOWAIT,
+ &m->m_ext_storage.ext_paddr);
- _MCLGET(m, mcl_cache, MCLBYTES, nowait);
+ if (m->m_ext_storage.ext_buf == NULL)
+ return;
+
+ MCLINITREFERENCE(m);
+ m->m_data = m->m_ext.ext_buf;
+ m->m_flags = (m->m_flags & ~M_EXTCOPYFLAGS) |
+ M_EXT|M_EXT_CLUSTER|M_EXT_RW;
+ 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;
+ /* ext_paddr initialized above */
+
+ mowner_ref(m, M_EXT|M_EXT_CLUSTER);
}
/*
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.195 src/sys/sys/mbuf.h:1.196
--- src/sys/sys/mbuf.h:1.195 Fri Apr 27 08:51:26 2018
+++ src/sys/sys/mbuf.h Fri Apr 27 09:22:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.195 2018/04/27 08:51:26 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.196 2018/04/27 09:22:28 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -507,29 +507,6 @@ do { \
* a normal mbuf; the flag M_EXT is set upon success.
*/
-#define _MCLGET(m, pool_cache, size, how) \
-do { \
- (m)->m_ext_storage.ext_buf = (char *) \
- pool_cache_get_paddr((pool_cache), \
- (how) == M_WAIT ? (PR_WAITOK|PR_LIMITFAIL) : PR_NOWAIT, \
- &(m)->m_ext_storage.ext_paddr); \
- if ((m)->m_ext_storage.ext_buf != NULL) { \
- MCLINITREFERENCE(m); \
- (m)->m_data = (m)->m_ext.ext_buf; \
- (m)->m_flags = ((m)->m_flags & ~M_EXTCOPYFLAGS) | \
- M_EXT|M_EXT_CLUSTER|M_EXT_RW; \
- (m)->m_ext.ext_flags = 0; \
- (m)->m_ext.ext_size = (size); \
- (m)->m_ext.ext_free = NULL; \
- (m)->m_ext.ext_arg = (pool_cache); \
- /* ext_paddr initialized above */ \
- mowner_ref((m), M_EXT|M_EXT_CLUSTER); \
- } \
-} while (/* CONSTCOND */ 0)
-
-/*
- * The standard mbuf cluster pool.
- */
#define MCLGET(m, how) m_clget((m), (how))
#define MEXTMALLOC(m, size, how) \
