From nobody Sun Jan 22 09:19:16 2023 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 4P07385lg0z315Pv; Sun, 22 Jan 2023 09:19:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P07385Hx2z3Pck; Sun, 22 Jan 2023 09:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379156; 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=nz9lx9qa3CaaGnnVJrh7pBayn2WwoPjPVvRE1jGBqqo=; b=D9ZssMRNJhjWBDHedjcoKvIFFowItmfYYhWKk2LXlhFLxWllDB3wxziMgzEyJDBKr764tM YmP6x+tMbFgT2nGAQF/pI/5WgPIdpppclSI8ChnwdAzx3sGbugAwKbNqBTL72mOVNddn5o +Z/Ln99yRle5Rnuh+oF+0YvDOvL8ikppVDI93Vq7qhJLaCo355mgAVWJjwIdneagKA6ipE lcYheGl13PWAOLbmP9oxGYRpznksvXSVARGBw/j8hicsaJzYraxwE5dzBdvkVeoGya1j/M sSU4/kARHfk/gl4nj6AluHZr+mjojfAQ3/d1mjJq+jAHX2jwxHoyAiPkX1IHXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379156; 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=nz9lx9qa3CaaGnnVJrh7pBayn2WwoPjPVvRE1jGBqqo=; b=aX/OZ+Q5mPX5Oyi5ny4lhbYD+fWgaakg8872wZHfDKmaHDHILk8MtxnokN2l80XTXSM7dM eKl8lAPZ9sioTezM10aOYNQ2aujnBkmc4mfdKer7HPkgo3XyigWXuhhaZTZnQQNY3vxUTu aNrxomahI7NxzOmmuX12isJcwb8R9gTixYbbIJApC5nVhHTHNy2I72cdCVW/21JIXOjQ1C DvCPSyIUmA8E/IpokC7w0Cvj5HeFWWTYOgSkbc9fr5WhW6uCplxaNEFFJ7Xq3U1Yq8YDCr Pi6JX9IdQ7mr23qh8dUS1PjWaiCMM5rC2C2K3+wDfJVVN4XGCRPke1zpaDn7OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674379156; a=rsa-sha256; cv=none; b=lYk5Nk3FXq02x/NJac0e/bv88xUnkJiu03XvLLaL+7mYLWnAgYuDjb6iPRkiJJeTjWrsQN Znfd8hKdBe9ffTbIr16U+WAfcwNOa6Pb+528GeQUJZYXVjLUm2kFOgzBn9H0oQZ7cbjj7f kU8jUhmYKCpikGZrB76CtwnBSEh1vE/yeKpY1d0wlq5JrzKXoiUBPwRTZxpChQRaU4IRQt fmbJ5uIv7JWvLzo1inp+r5MlKqZ0GW9ulkIlkj6y4gIRZvqQvCIUtjQPNm0KkrWtCB56q9 Ots83z0Kf09vJ+EjXKfd9Ux14IwrpBeCu3aCcvChVQq87wnOL8HPaWUcTJnZ9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P07384859zk3x; Sun, 22 Jan 2023 09:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30M9JG1r044195; Sun, 22 Jan 2023 09:19:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M9JGXm044194; Sun, 22 Jan 2023 09:19:16 GMT (envelope-from git) Date: Sun, 22 Jan 2023 09:19:16 GMT Message-Id: <202301220919.30M9JGXm044194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2c5bfa8b8c6b - stable/13 - Require INVARIANTS and WITNESS if DEBUG_VFS_LOCKS is set 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c5bfa8b8c6b8ed0a988b0137725813430b478d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5bfa8b8c6b8ed0a988b0137725813430b478d6 commit 2c5bfa8b8c6b8ed0a988b0137725813430b478d6 Author: Konstantin Belousov AuthorDate: 2023-01-15 21:33:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-22 09:18:09 +0000 Require INVARIANTS and WITNESS if DEBUG_VFS_LOCKS is set Tested by: pho (cherry picked from commit 0f80d5ebc898f487067a3f2232f9ab0a7b291277) --- sys/kern/vfs_subr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index ca2d86385f4c..81bad2da0f0c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -99,6 +99,10 @@ __FBSDID("$FreeBSD$"); #include #include +#if defined(DEBUG_VFS_LOCKS) && (!defined(INVARIANTS) || !defined(WITNESS)) +#error DEBUG_VFS_LOCKS requires INVARIANTS and WITNESS +#endif + #ifdef DDB #include #endif