From nobody Sat Sep 17 10:45:41 2022 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 4MV6zV1B5Yz4cM50; Sat, 17 Sep 2022 10:45:42 +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 4MV6zV0Qv3z3q8t; Sat, 17 Sep 2022 10:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663411542; 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=J+sKajw5k/wSf2lWe6kSEL0MZ3uEmI7bNyvE5f+ci9c=; b=piR+8ZBUBqZ4McyzwHhblap+LlEqtfShaf7BkXXd0s4RZTxaMAyHZrLIJYIM/YLUN3pkyL 7u+czJoA3sG/qkKMGm/BuRqdZcjVrp85Gmc3wTVLp+ZTwmUKiWOfK8Of2Don76bF5IUv5a QN3PFeOKrSzoLBj4shNkexwWlwo5lHM0ubRuumOtFNKAAnEXkb6crvWJlzqpEZTFt33Abb 5X/mvDrma8fDjkxFGCcVee1T/uz1JNRYSA355fTqOjdwA7etAdHMkPnMz8pejuNG1mSDHf 8BqxcFo81C7kbWmxGJsX4vwZW9fE761JFjQ5cPUend8kxO4qXRcxXG5dGQGN4A== 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 4MV6zT6bNnzghJ; Sat, 17 Sep 2022 10:45:41 +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 28HAjfQe099971; Sat, 17 Sep 2022 10:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HAjfmW099970; Sat, 17 Sep 2022 10:45:41 GMT (envelope-from git) Date: Sat, 17 Sep 2022 10:45:41 GMT Message-Id: <202209171045.28HAjfmW099970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b77bdfdb67c2 - main - vfs: fix non-INVARIANTS build after 5b5b7e2ca2fa9a2418dd51749f4ef6f881ae7179 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b77bdfdb67c2e9660658a0373662e4263a905e90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663411542; 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=J+sKajw5k/wSf2lWe6kSEL0MZ3uEmI7bNyvE5f+ci9c=; b=ZmFpQ+3ZOthzdosTRzxKwhKCVkl+wFLKDkfVj4kvSoJelPjrNk9soreUUArI6lOUpxwDcm 4bLeAnJnKvKLrwfo+Yfqmo30uMECnoH4qWoWOiNGc6LJMPgLnpHb30D1U5eIvjuPvuDOyY lVCdBYbHHSZsm8Z3YNnoWjWYUUlnscIGd4SAA6LL7bwEHLbv3AblHa+XzvRKS5d1XkPsNi UMPOCQ+V+U/B87cWof63ZYEptiH+MpOM4bPhlzKvF97jyJG7ogUm73/atk7mvX5nhQVvwj DDw1qh3C7RMrw34w7s+yyKxj46gxstLUqvtqHDKOHjYa4Yl6H5l5AgyV3k+tPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663411542; a=rsa-sha256; cv=none; b=RXiKnGvWITH4EUIBMJKoSAY7LLbsFF93QstlH5o5Msj5CmqAMCI0WIt6PRGPFrh3QLNPbg uzJWPpzW8cy2YwvnaYPm9s4Acc2yty3OZnz+wlYpXDPMvdrbVdthQg05h7z+1tE6Njor4p Nd2VaHsfUP/Ei2PV4gYWeb5R8c9Gnpr5DuE6BM9FWccML3BA/pXEwoy1nB79mPb4EX5O/U KxRqzWiu1lTE7lvKpYCi01nYOLXeJL6cL/5hd7PWArKmu9NQBI2sywZEbPkucK4JvWMRqn k6GFGuaX4K2vd3vACEXjIA64od9YLeaXh+kWdCFw+YLJ8lKwacEJflzMkgwkYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b77bdfdb67c2e9660658a0373662e4263a905e90 commit b77bdfdb67c2e9660658a0373662e4263a905e90 Author: Mateusz Guzik AuthorDate: 2022-09-17 10:45:12 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-17 10:45:12 +0000 vfs: fix non-INVARIANTS build after 5b5b7e2ca2fa9a2418dd51749f4ef6f881ae7179 Reported by: gj --- sys/kern/vfs_lookup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 7fac64ff1b38..7e6ab13a4fd0 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -76,10 +76,10 @@ __FBSDID("$FreeBSD$"); #ifdef INVARIANTS static void NDVALIDATE_impl(struct nameidata *, int); -#endif - #define NDVALIDATE(ndp) NDVALIDATE_impl(ndp, __LINE__) - +#else +#define NDVALIDATE(ndp) +#endif SDT_PROVIDER_DEFINE(vfs); SDT_PROBE_DEFINE4(vfs, namei, lookup, entry, "struct vnode *", "char *",