d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache: improve vnode vs name assertion in cache_enter_time

Browse Source
This commit is contained in:
Mateusz Guzik 2022-02-09 21:41:24 +01:00
parent 611470a515
commit 1d65a9b47e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/vfs_cache.c
View File

@ -2387,18 +2387,21 @@ 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) {
VNPASS(!VN_IS_DOOMED(vp), vp);
VNPASS(vp->v_type != VNON, vp);
}
if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
KASSERT(dvp == vp,
("%s: different vnodes for dot entry (%p; %p)\n", __func__,
dvp, vp));
} else {
KASSERT(dvp != vp,
("%s: same vnode for non-dot entry [%s] (%p)\n", __func__,
cnp->cn_nameptr, dvp));
}
#ifdef DEBUG_CACHE
if (__predict_false(!doingcache))