From nobody Mon Jan 16 03:56:03 2023 X-Original-To: dev-commits-src-main@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 4NwJ901y6cz2sX4q; Mon, 16 Jan 2023 03:56:04 +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 4NwJ901BpSz3DpV; Mon, 16 Jan 2023 03:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673841364; 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=SnkKrJUMLSjwab5kFBu7yC03RydPK/GNMvzeVKIRN3E=; b=ZUucA/Ru8Kj2Jl/Aj+SIjazHTlr65ZZZa3wKfdI2TUUm9g3B9D1U9QB+4+3oa+RzqeYZL1 iho/avFpN7z+hmvXWxFHOiMLg1d1DsNvuqZoUGyUMr7xAaL3Zn5BEdF6xw11wde504evd3 Bku7Jn7l4KLSDpGX2OwZWW8/ouy4zzMl7e380Jm98R3186WhZE++awwMHwnvjQr3+QI9La dlTa5bTVbMGs3ZwFH1HlEpdHQpJPn/PNS6dJpPKI78Ho6YmhV6GTjmL/Gd8wNTHN1Xk8lT ulL3f35o86oAvQDu+PztWPjLgmYJ49a4PtolA5cETib0zD69Z4nt467FBEa67g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673841364; 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=SnkKrJUMLSjwab5kFBu7yC03RydPK/GNMvzeVKIRN3E=; b=TQqWpBy+l30KW8ABgmWlrfC6PfrgdatAkfwu/hyeUpKPqslxz9SGSChmTAcpBzcQUOz5Ks FzcPU6PC5WOfrbg76guW0beSf6bZYiwVH0OZTyXDaJeDZay8l8xtYRwB1YA7Iki67LwW/A chLQ8Aii4sh42d1CDMqzRzEs60gcNqMeLoCOXdMCCC0Q4US395MmIo5dvnTiHM0artqo9c 69OhzeXBbpCbezs/SN8pHwbXCjq8skNKRlFRjsyLN9mKKtMvN1UxsrwgSKcKBWf0gBKEIA vc4Zk9288KzvWpRT+Q84PtGCjLEkzJSiy/vvCIW4ScaThELB9edI0p16waOZJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673841364; a=rsa-sha256; cv=none; b=tqfTBbHqFr9YBVa3vTSpbD0i9/cC/cKZ3eFgn/bGUGVoHe4Imj7q+tHuXqMHLI2PdvxKal pWqUZc91droaYlc0BHqJYqvAh/uVpT8sjJCriejr9yxsg1Mrend5MaAy+x3j2+V3X/kool BVWjX8Nc+ci8HXJCPa09pEIHp1yxAISjvfnwcpOLXrizzv/PBu94ZfpuD2AKGZ6mEZvE0o mEp06N8FtJ1r+V4V08khOqWAPnwXlylg6YSHue5IsoJSEP81M9VojJN4JerIFYUT/MB5N2 eVXQ6ofhpqRXVXTFZuMkAzKHKGW+SK13H2ZxodON89goGuvIS5WqEG40+YgtwA== 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 4NwJ900FWZzsXN; Mon, 16 Jan 2023 03:56:04 +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 30G3u3LB030601; Mon, 16 Jan 2023 03:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30G3u3h5030600; Mon, 16 Jan 2023 03:56:03 GMT (envelope-from git) Date: Mon, 16 Jan 2023 03:56:03 GMT Message-Id: <202301160356.30G3u3h5030600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0f80d5ebc898 - main - Require INVARIANTS and WITNESS if DEBUG_VFS_LOCKS is set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0f80d5ebc898f487067a3f2232f9ab0a7b291277 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f80d5ebc898f487067a3f2232f9ab0a7b291277 commit 0f80d5ebc898f487067a3f2232f9ab0a7b291277 Author: Konstantin Belousov AuthorDate: 2023-01-15 21:33:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-16 03:55:47 +0000 Require INVARIANTS and WITNESS if DEBUG_VFS_LOCKS is set Reported by: pho Reviewed by: markj, mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38070 --- 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 d49f97a7060e..a1a73f2ddf38 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