The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b79115e13010467d009fc3fed49c0a332f953833
commit b79115e13010467d009fc3fed49c0a332f953833 Author: John Baldwin <[email protected]> AuthorDate: 2025-12-09 15:59:19 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2025-12-19 15:19:41 +0000 rman: Simplify initialization of internal globals Use TAILQ_HEAD_INITIALIZER and MTX_SYSINIT to remove the 'once' code from rman_init. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D54142 (cherry picked from commit a35eae89cbddaac73d3b6c2b5c1b90e3a0c00997) --- sys/kern/subr_rman.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index f5a782a00dce..08a3dbcd33d2 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -103,8 +103,10 @@ SYSCTL_INT(_debug, OID_AUTO, rman_debug, CTLFLAG_RWTUN, static MALLOC_DEFINE(M_RMAN, "rman", "Resource manager"); -struct rman_head rman_head; +struct rman_head rman_head = TAILQ_HEAD_INITIALIZER(rman_head); static struct mtx rman_mtx; /* mutex to protect rman_head */ +MTX_SYSINIT(rman_mtx, &rman_mtx, "rman head", MTX_DEF); + static int int_rman_release_resource(struct rman *rm, struct resource_i *r); static __inline struct resource_i * @@ -122,14 +124,6 @@ int_alloc_resource(int malloc_flag) int rman_init(struct rman *rm) { - static int once = 0; - - if (once == 0) { - once = 1; - TAILQ_INIT(&rman_head); - mtx_init(&rman_mtx, "rman head", NULL, MTX_DEF); - } - if (rm->rm_start == 0 && rm->rm_end == 0) rm->rm_end = ~0; if (rm->rm_type == RMAN_UNINIT)
