From owner-dev-commits-src-branches@freebsd.org Sat May 22 18:23:54 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6BC456340A7; Sat, 22 May 2021 18:23:54 +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 4FnX1620nFz4Tv8; Sat, 22 May 2021 18:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DD79C10BD; Sat, 22 May 2021 18:23:53 +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 14MINr9t005811; Sat, 22 May 2021 18:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14MINr7n005810; Sat, 22 May 2021 18:23:53 GMT (envelope-from git) Date: Sat, 22 May 2021 18:23:53 GMT Message-Id: <202105221823.14MINr7n005810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 400907c645ce - stable/13 - cache: extend mismatch vnode assert print to include the name 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 400907c645ce0b6e8bbd0375f4f46dd6cd2d54a1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 18:23:54 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=400907c645ce0b6e8bbd0375f4f46dd6cd2d54a1 commit 400907c645ce0b6e8bbd0375f4f46dd6cd2d54a1 Author: Mateusz Guzik AuthorDate: 2021-04-15 07:55:43 +0000 Commit: Mateusz Guzik CommitDate: 2021-05-22 18:21:28 +0000 cache: extend mismatch vnode assert print to include the name (cherry picked from commit 4f0279e064bb163dbcc4859e409fc65dcbe8f1bf) --- sys/kern/vfs_cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 31d6668a3565..ec5bb0c39c99 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2468,12 +2468,12 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, MPASS(cache_ncp_canuse(n2)); if ((n2->nc_flag & NCF_NEGATIVE) != 0) KASSERT(vp == NULL, - ("%s: found entry pointing to a different vnode (%p != %p)", - __func__, NULL, vp)); + ("%s: found entry pointing to a different vnode (%p != %p) ; name [%s]", + __func__, NULL, vp, cnp->cn_nameptr)); else KASSERT(n2->nc_vp == vp, - ("%s: found entry pointing to a different vnode (%p != %p)", - __func__, n2->nc_vp, vp)); + ("%s: found entry pointing to a different vnode (%p != %p) ; name [%s]", + __func__, n2->nc_vp, vp, cnp->cn_nameptr)); /* * Entries are supposed to be immutable unless in the * process of getting destroyed. Accommodating for