git: 1239a722214c - main - cache: temporarily drop the assert that dvp != vp when adding an entry

Mateusz Guzik mjg at FreeBSD.org
Sat Feb 27 22:29:55 UTC 2021


The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=1239a722214c245e642733fdea2b1348101598af

commit 1239a722214c245e642733fdea2b1348101598af
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-02-27 22:23:23 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-02-27 22:29:50 +0000

    cache: temporarily drop the assert that dvp != vp when adding an entry
    
    Historically it was allowed for any names, but arguably should never be
    even attempted. Allow it again since there is a release pending and
    allowing it is bug-compatible with previous behavior.
    
    Reported by:    otis
---
 sys/kern/vfs_cache.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index fef1e31d197b..8cae0260cbf0 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -2266,7 +2266,12 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp,
 	KASSERT(cnp->cn_namelen <= NAME_MAX,
 	    ("%s: passed len %ld exceeds NAME_MAX (%d)", __func__, cnp->cn_namelen,
 	    NAME_MAX));
+#ifdef notyet
+	/*
+	 * Not everything doing this is weeded out yet.
+	 */
 	VNPASS(dvp != vp, dvp);
+#endif
 	VNPASS(!VN_IS_DOOMED(dvp), dvp);
 	VNPASS(dvp->v_type != VNON, dvp);
 	if (vp != NULL) {


More information about the dev-commits-src-all mailing list