From nobody Fri Dec 19 15:32:18 2025 X-Original-To: dev-commits-src-all@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 4dXs3Q4m28z6LtKF for ; Fri, 19 Dec 2025 15:32:18 +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 4dXs3Q26v6z3Z4N for ; Fri, 19 Dec 2025 15:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158338; 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=suHkzVlOLJHf38eUPp8d8k+MPXszpYEgmLBgTDb4TZo=; b=UxhBj4rjl/RWVcToJNxibvjYGhFm76lh/L+gqatPVFUATkL9nYntOrKw94EELMs+eOZAlr 7duYsnUNpDP+BWdNQ2++XAIrlprgT/XRa5mplUyWKZBEYRtugC13gPp5PYGZ0a8EZoh/47 AKaSx+3t3zl2HrkAdW6dnPsLVDBspKpDPcarO2VZ8OamR8EiLVhrgQBOuStz5YKAeirPnW /659daKazN9D3YOS7BVwuCciljV09GiK12tmuQwAwqevsdZqLFChmHn7nB0LqigpdwB0+r zTsXkW8DNX3ykfdvylxzazUKOBcmw1mjom+ugqHW3kQTm8jjDc6krMiJKHxU4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158338; 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=suHkzVlOLJHf38eUPp8d8k+MPXszpYEgmLBgTDb4TZo=; b=IB5gmmTFt6rfaML+yiKTwTGt/hriyexaOZTnB1L4hS8DS9plJY2ld+PqnT1gJzitxTUGzt ldNE4ANkeKgMjjIYGC7dO6IfxZiclclUdLYo9RuGBTdymiD8Hya4wk4JppVTbEeFOK4IcI TjlGBUCI2xKIUC5WLVpQSjLVqCHGlPrFBNV1pC7absYVP7DQGuPXuuaCN2MNXXAb1mtwMn p/ZzcY+hQ9O4dPVnOrJ6C8J/p5hZtg7zycZoRIFfx+GCamgIUUv7HgQoxiLTdhXtTxzAKi 2KybPm/wUfl6q02kfooBszoF/fjg4l4ezuRo+yki4i3TEgC8UnKMh8408oWzyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158338; a=rsa-sha256; cv=none; b=vPNmIS9cSSFXlrrq5nHvhHVuR0ix50DjQ747sjIDpJylfM8UmoSFSmGuQdi/NP3wtPdMly MHR/BesQMKRCInhOK6M0p3EOXicN00xyXJX6FnL7erVtAPc/kHID8X0or974Py1/nLt9Hx WX07q2b43ywO/F4pSl9NtW1XYXDd7K6G7DW+I3fswnsJ4IXtPgrO5rhlaooh0ze8DSNCAJ KZ+7Gj1oIqNTO9iFBKsLoSnwcXBxjDh6XQGNHUu8JpXNxVVsFTG//+e0hMEKUcIz1PyhQw 81TNrobR3dL1RAR+a3dv4TWuJKYYj3bZ6TC5GB4wYoOuoj5i2vG/Z4MezG2aBw== 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 4dXs3Q19rTz1SMq for ; Fri, 19 Dec 2025 15:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 453dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6a99a27d4345 - stable/15 - rman: Simplify initialization of internal globals List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 6a99a27d434559160e64eaac3c7f5898d9997f48 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:18 +0000 Message-Id: <69457002.453dc.5e70331f@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6a99a27d434559160e64eaac3c7f5898d9997f48 commit 6a99a27d434559160e64eaac3c7f5898d9997f48 Author: John Baldwin AuthorDate: 2025-12-09 15:59:19 +0000 Commit: John Baldwin CommitDate: 2025-12-19 15:19:44 +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 dbb09850d049..b8528104ba28 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -102,8 +102,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 * @@ -121,14 +123,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)