diff options
author | Mateusz Guzik <mjg@FreeBSD.org> | 2021-02-27 22:23:23 +0000 |
---|---|---|
committer | Mateusz Guzik <mjg@FreeBSD.org> | 2021-04-10 14:00:57 +0000 |
commit | 8393e034dacec0bbafdd470c3cceaecc693357ea (patch) | |
tree | c08416a1d8c337c5b59b6183557d65895f335ea1 | |
parent | c16fc9eae3adca98f6d12ec4f54e043db1f8902b (diff) | |
download | src-8393e034dacec0bbafdd470c3cceaecc693357ea.tar.gz src-8393e034dacec0bbafdd470c3cceaecc693357ea.zip |
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
(cherry picked from commit 1239a722214c245e642733fdea2b1348101598af)
-rw-r--r-- | sys/kern/vfs_cache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index b5fa21eea887..8819ef483af5 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2394,7 +2394,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) { |