Module Name: src
Committed By: msaitoh
Date: Wed Oct 6 05:24:54 UTC 2021
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
Fix a bug that NMBCLUSTERS(kern.mbuf.nmbclusters) can't be changed by sysctl.
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 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.243 src/sys/kern/uipc_mbuf.c:1.244
--- src/sys/kern/uipc_mbuf.c:1.243 Thu Mar 4 01:37:42 2021
+++ src/sys/kern/uipc_mbuf.c Wed Oct 6 05:24:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.243 2021/03/04 01:37:42 msaitoh Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.244 2021/10/06 05:24:54 msaitoh Exp $ */
/*
* Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.243 2021/03/04 01:37:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.244 2021/10/06 05:24:54 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -165,11 +165,7 @@ nmbclusters_limit(void)
max_size = MIN(max_size, NMBCLUSTERS_MAX);
#endif
-#ifdef NMBCLUSTERS
- return MIN(max_size, NMBCLUSTERS);
-#else
return max_size;
-#endif
}
/*
@@ -199,7 +195,7 @@ mbinit(void)
* Set an arbitrary default limit on the number of mbuf clusters.
*/
#ifdef NMBCLUSTERS
- nmbclusters = nmbclusters_limit();
+ nmbclusters = MIN(NMBCLUSTERS, nmbclusters_limit());
#else
nmbclusters = MAX(1024,
(vsize_t)physmem * PAGE_SIZE / MCLBYTES / 16);
