From nobody Wed Aug 9 10:38:04 2023 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 4RLRND5X6yz4pmT1; Wed, 9 Aug 2023 10:38: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 4RLRND542Rz3MQC; Wed, 9 Aug 2023 10:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691577484; 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=d3R0hsVoJqFp0GzTkJEQzg0di85AVeVdGZyOziG2hio=; b=lSYUKk5SZ8HTf+Gxl9lF7ofiFZY0fxyIxH5xPEJVdGeyE35DAG44LMH6pYFHdAVsCm72Rr apeStpJI0NBjJaypp3JIcIC07CVxE0NpC0SV926Y0Ulm4mMUp+T2lpGBjF3llZPrOIU9iH psLjmuUvLOwFZnGwxYqld+pnitXpXux4kkq3WGiwOlbqQmcOQHfFj8ICPKmTsdLI6BcIiT txwpXT2jf81/67ZMqM6efRyFnvNb2lOB4gPBK0B/quOR5DzaMQCsYhlVTzopGZDv6bgbH9 ptHrPYy2AOUTdt3iTrAJKQGCHLZ68a7idhO8XyM5lIvRiPKyzRxqHLULluLCEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691577484; 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=d3R0hsVoJqFp0GzTkJEQzg0di85AVeVdGZyOziG2hio=; b=j1GEEAvjhxnFFuCDYH1ACKzAvgHE3VLMLOidwTeB3/c1dIxuQqKczFG9UYNOgYvPv63EEt SXcWsrDNWLq9lyU7H0plNhRp8/nw73B6gQI7TDNfZU0nNwc22jdiEsMynfpcewIxeGvoiO T030hyq7Xo/7NZUSGzyoxBqiqHEAAV10bW5TBeUaH0tcHlJUvWeDysCTgLYtnWBKlIrs3I vsDeZiCDY1U46HFhhdP6RdVc8yviKZfsue89RpwZZxXiP3Xw19X52ZoQb/Jv7//bOX4pW7 ySl57asWx7Z2Z3RPDgXbBPCkjnUP7KFITmA5yHqzupaA6N0EgYmAek/og+270w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691577484; a=rsa-sha256; cv=none; b=eLcdvIFiXlp1xy/Btcmpzz5YDP+AAIys1o48DALTnXOzbD77YCMIoH1BDEO9lvBp7Xgjtd EdY2Nk68Ndn5nATwF8geZbCFRuYiZ5kguxKTd/pzEOBnpF8UJlQ5S6tSqZeYOcVFKWlxme acq3fXmk6k5QhjXk/+rr/TWupmS8trLGJqqz1HIjG0HO/wrtqphbEcG6sNi6jR7LcrFby4 SwBY+YO7ilXJfBVFtbKpvuWOvKqhngEf9ojC1/ToQ09znrYuGq9TGXXCEuwbTIwnMaHLHq fVkPjQ5na4avEqEY4jMMCVlc0xmLwnkXlANTa1xaJmh5p5zZ7u+l0Yb19YeQoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLRND468Wz1BTW; Wed, 9 Aug 2023 10:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379Ac4SO039241; Wed, 9 Aug 2023 10:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Ac4rM039238; Wed, 9 Aug 2023 10:38:04 GMT (envelope-from git) Date: Wed, 9 Aug 2023 10:38:04 GMT Message-Id: <202308091038.379Ac4rM039238@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: b8b33f3b3b71 - main - vfs: retire NAMEI_DIAGNOSTIC 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: b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce commit b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce Author: Mateusz Guzik AuthorDate: 2023-08-09 10:37:13 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-09 10:37:13 +0000 vfs: retire NAMEI_DIAGNOSTIC It is too spammy and information-deficient for practical use. Also see https://reviews.freebsd.org/D41207 --- sys/kern/vfs_lookup.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 1f62cf3e6652..9ed7990fb8fb 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -71,9 +71,6 @@ __FBSDID("$FreeBSD$"); #include -#define NAMEI_DIAGNOSTIC 1 -#undef NAMEI_DIAGNOSTIC - #ifdef INVARIANTS static void NDVALIDATE_impl(struct nameidata *, int); #define NDVALIDATE(ndp) NDVALIDATE_impl(ndp, __LINE__) @@ -1106,12 +1103,6 @@ dirloop: error = ENAMETOOLONG; goto bad; } -#ifdef NAMEI_DIAGNOSTIC - { char c = *cp; - *cp = '\0'; - printf("{%s}: ", cnp->cn_nameptr); - *cp = c; } -#endif prev_ni_pathlen = ndp->ni_pathlen; ndp->ni_pathlen -= cnp->cn_namelen; KASSERT(ndp->ni_pathlen <= PATH_MAX, @@ -1258,18 +1249,12 @@ unionlookup: */ if (needs_exclusive_leaf(dp->v_mount, cnp->cn_flags)) cnp->cn_lkflags = LK_EXCLUSIVE; -#ifdef NAMEI_DIAGNOSTIC - vn_printf(dp, "lookup in "); -#endif lkflags_save = cnp->cn_lkflags; cnp->cn_lkflags = enforce_lkflags(dp->v_mount, cnp->cn_lkflags); error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp); cnp->cn_lkflags = lkflags_save; if (error != 0) { KASSERT(ndp->ni_vp == NULL, ("leaf should be empty")); -#ifdef NAMEI_DIAGNOSTIC - printf("not found\n"); -#endif if ((error == ENOENT) && (dp->v_vflag & VV_ROOT) && (dp->v_mount != NULL) && (dp->v_mount->mnt_flag & MNT_UNION)) { @@ -1321,9 +1306,6 @@ unionlookup: } good: -#ifdef NAMEI_DIAGNOSTIC - printf("found\n"); -#endif dp = ndp->ni_vp; /* @@ -1509,12 +1491,7 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, * Search a new directory. * * See a comment in vfs_lookup for cnp->cn_nameptr. - */ -#ifdef NAMEI_DIAGNOSTIC - printf("{%s}: ", cnp->cn_nameptr); -#endif - - /* + * * Check for "" which represents the root directory after slash * removal. */ @@ -1541,9 +1518,6 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, /* * We now have a segment name to search for, and a directory to search. */ -#ifdef NAMEI_DIAGNOSTIC - vn_printf(dp, "search in "); -#endif if ((error = VOP_LOOKUP(dp, vpp, cnp)) != 0) { KASSERT(*vpp == NULL, ("leaf should be empty")); if (error != EJUSTRETURN)