Module Name: src
Committed By: riastradh
Date: Fri Dec 24 00:13:53 UTC 2021
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
pool(9): Fix default PR_NOALIGN for large pool caches.
Was broken in recent change to separate some pool cache flags from
pool flags.
Fixes crash in zfs.
To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 src/sys/kern/subr_pool.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/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.279 src/sys/kern/subr_pool.c:1.280
--- src/sys/kern/subr_pool.c:1.279 Wed Dec 22 16:57:28 2021
+++ src/sys/kern/subr_pool.c Fri Dec 24 00:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.279 2021/12/22 16:57:28 thorpej Exp $ */
+/* $NetBSD: subr_pool.c,v 1.280 2021/12/24 00:13:53 riastradh Exp $ */
/*
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018,
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.279 2021/12/22 16:57:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.280 2021/12/24 00:13:53 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -2110,7 +2110,7 @@ pool_cache_bootstrap(pool_cache_t pc, si
pool_cache_t pc1;
struct cpu_info *ci;
struct pool *pp;
- unsigned int ppflags = flags;
+ unsigned int ppflags;
pp = &pc->pc_pool;
if (palloc == NULL && ipl == IPL_NONE) {
@@ -2123,6 +2123,7 @@ pool_cache_bootstrap(pool_cache_t pc, si
palloc = &pool_allocator_nointr;
}
+ ppflags = flags;
if (ctor == NULL) {
ctor = NO_CTOR;
}
