From nobody Fri Dec 19 15:32:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dXs3x3Bs4z6LtfL for ; Fri, 19 Dec 2025 15:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXs3w5KNXz3Zn4 for ; Fri, 19 Dec 2025 15:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1KmTkd+FJ/toHnUQUMvTuC8ohAbEd5n4ZyxGJaQ43d8=; b=bi16wOwf8awPj4GwH5xEE1IFTnodi6ujXkN6cJuhS16E46VzIL457RxuIPLXL/kSj3cbJ3 1fi6jlMcsBcXGT30eEr6B+WfhJNO8AuTg97QrrJmgPiEviqhZjgmGDPcLKY6aDi5sz07I6 +BnoVdNerAv6i2qStFrQfEgmi3izzk5vIJ4C9xdhXtFlTuppv1dMAMdn9opWn+45IT6mQm EnnpP83WrkKNE+u2z01s45/zTf2wtW5opNML7WlYkcZZSRenBSQaIgESvtROAdSKGeTck3 wE3JsciwDnfA7CCFp3AKkf+T2JUhwNtry6YdixW3C1NTFzBXV7xSbPLVoDUnFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1KmTkd+FJ/toHnUQUMvTuC8ohAbEd5n4ZyxGJaQ43d8=; b=INpy+gs6WSQHFJoJ3Fdfe7ZdukxLXsJH2mg8flcVQWLIEO1o1Lw23ViY7bg028uCUiKYGA pu3VAOnXBLqsJZxY9fj7pld5qeI5L6DwZEBk3ohy2cPHvZRZD+kIiYUqxet5X4siQ3lu+Q wK4V/ooyY1rOQIiZPXUCgRf+kULYRDmUbmUl6Nkzfi8cp/UkNF+A7VjywRzmy6FNhD+G9m mmoNL5egj2cqpJk8QQrUT6SLD3Jfy/M7kRqXE2i1k5Nwh4h/GopuKRwvrA4n9ozqTJyhN8 otMSz2CroGsMRzmJq5YDeU79WJZcc1ithTIIZwRhGw3Ri86aHagbnBQ0rkOT7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158364; a=rsa-sha256; cv=none; b=WnCxWXn69FIX6zKMfhocW0KjLFkZtohXYyPv8xvh8Rer15zgrrO+EkLkmKXDCWhsfjQITx 8zbsD6WGLihWo/ygzBc+eOqWzPvXJAVj6y+lOHmr+icciDn3b3MX4g4tD3Z4tlkjAsxnhK bPIFmawuseuQGdvAPI9E4gPWJJXgH6JXTh8ZLTg33yIJNPJ5BVzk8mZ2zjk+5ua+9+F+qR xpTYPfCwtLf4RmLs4fX1nZL4941N+dSUBIolsj3Z3CzawIXEWPPL/chP/TZff5b7EbFyUm UZkK53mfhnL9QTYVi2trwZmWQjYy6kx7i+10hw3CdP/Qkgry8vWxi2IIVWQGiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXs3w4sNGzF1 for ; Fri, 19 Dec 2025 15:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43c63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b79115e13010 - stable/14 - rman: Simplify initialization of internal globals List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b79115e13010467d009fc3fed49c0a332f953833 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:44 +0000 Message-Id: <6945701c.43c63.16a91dec@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b79115e13010467d009fc3fed49c0a332f953833 commit b79115e13010467d009fc3fed49c0a332f953833 Author: John Baldwin AuthorDate: 2025-12-09 15:59:19 +0000 Commit: John Baldwin 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)