From nobody Mon Sep 12 22:52:37 2022 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 4MRMLY3Yytz4cYS2; Mon, 12 Sep 2022 22:52:37 +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 4MRMLY2nGyz3sv3; Mon, 12 Sep 2022 22:52:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663023157; 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=3lyfAuvFbr3sCJLnCZIpiptcgNPFbkHIyLDSpHrM+Rk=; b=xL0BiIJMAp86wCCQmQ84BgiXym5MswDE0ejtlfv1a3GGmXQbZh4YmBqkDnikENQN7Zn8cj WxYQRtcXmFgdP+XevnfmmIMMsOFVceNCaQw3uyVcPpyxbTBEM/k/ZMe2MpeI+GmxYyBZxn CccUBENYM7YiB9jrqbksQENuS4wKWj0weceSXYfT1ssrgW7xMVrIrHTvnPwtuk0tAs7VXk b32uIjPg1NISYwskikElypeiso1KstlL7HyilIix9B2mcYdanKSo5QBHiWsOtkXO9HagAE F8QmbHbeWh2mu05Fsdq+Ls3jRTwGqowju/Dlt5rrAb7vc9ML6qo9vONdW91+zg== 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 4MRMLY1qdzz17lF; Mon, 12 Sep 2022 22:52:37 +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 28CMqbXv049857; Mon, 12 Sep 2022 22:52:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28CMqbXB049856; Mon, 12 Sep 2022 22:52:37 GMT (envelope-from git) Date: Mon, 12 Sep 2022 22:52:37 GMT Message-Id: <202209122252.28CMqbXB049856@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: b4137c9ed158 - main - vfs: make NDVALIDATE private to vfs_lookup.c 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4137c9ed158cab16c55c0c14f5e6be7ae7df73a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663023157; 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=3lyfAuvFbr3sCJLnCZIpiptcgNPFbkHIyLDSpHrM+Rk=; b=KyebnkgzYFbM7Gv3deim4wArpJaB0V087I5Rgdx2Od/VCUKzL3BQgJKM/45kRdIC59chAV Xka7flxPHN+VqqhMi8mXChGMYyLp4hjUWm4HSbBBOcEvegYOeFLX1tYE8r0P+ji+g6w4Zl RIZOA3Wn8r2X7QpWq/ZlQmptGa3EBXybIItaWL2IIGuQzQjPPpvI/Y3HTDolfMOvOcvPHi gOwYNOiwKWFnpdO2/kjgPx3Lx0C0C8mMsMX1ulew1Zg2NdfzkhPVIIv1MH49Zl0QJrtuxU BEWibW721QHK/CtAwqsCiR9v/YxXTGXC4kuxGo+SVs0WKkKKd+G1HEE5GPR8ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663023157; a=rsa-sha256; cv=none; b=GNujzIuX++xDsKGmalrlbHDQp7JE/qQgZ8G24NaUM477Dz7225K1/PcPF/pZcolETGrHtP KLy6VBRrkv+gTVPCsObgljmtT+jZormtRbljYsvVYrIiia5btdhhXjBSsc/quZeQERgXWy HYv0E6P79x8/vhyKobB9rsuIUp/xtKZCaQD8oA+XnY85GCbrPFdKZIKq1x1BqUbt0DHYib m2JPY4g71k8mOlwzrdSMZUSrD7FFm/P1OiYHV0f4O8YX5E/HQsieKjdEGs3+oFBWTiELzX vFAEroDfQ84Ugu6pr/urineIV+uv6G6Nx05VVPGm9ypLZL9wzWUASy5EWmMh8Q== 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=b4137c9ed158cab16c55c0c14f5e6be7ae7df73a commit b4137c9ed158cab16c55c0c14f5e6be7ae7df73a Author: Mateusz Guzik AuthorDate: 2022-09-12 22:49:47 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-12 22:50:48 +0000 vfs: make NDVALIDATE private to vfs_lookup.c it is not used elsewhere. --- sys/kern/vfs_lookup.c | 8 +++++++- sys/sys/namei.h | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index cfaa12cfa8b9..20fb63dcee94 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -74,6 +74,12 @@ __FBSDID("$FreeBSD$"); #define NAMEI_DIAGNOSTIC 1 #undef NAMEI_DIAGNOSTIC +#ifdef INVARIANTS +static void NDVALIDATE(struct nameidata *); +#else +#define NDVALIDATE(ndp) do { } while (0) +#endif + SDT_PROVIDER_DEFINE(vfs); SDT_PROBE_DEFINE4(vfs, namei, lookup, entry, "struct vnode *", "char *", "unsigned long", "bool"); @@ -1643,7 +1649,7 @@ void * stricter over time. */ #define NDMODIFYINGFLAGS (LOCKLEAF | LOCKPARENT | WANTPARENT | SAVENAME | SAVESTART | HASBUF) -void +static void NDVALIDATE(struct nameidata *ndp) { struct componentname *cnp; diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 0b293d1d1abf..f6f6546342c0 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -298,10 +298,8 @@ void NDFREE(struct nameidata *, const u_int); #ifdef INVARIANTS void NDFREE_NOTHING(struct nameidata *); -void NDVALIDATE(struct nameidata *); #else #define NDFREE_NOTHING(ndp) do { } while (0) -#define NDVALIDATE(ndp) do { } while (0) #endif int namei(struct nameidata *ndp);