Date: Sat, 22 Aug 2020 16:58:34 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364487 - head/sys/kern Message-ID: <202008221658.07MGwYOJ086198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Sat Aug 22 16:58:34 2020 New Revision: 364487 URL: https://svnweb.freebsd.org/changeset/base/364487 Log: cache: stronger vnode asserts in cache_enter_time Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Sat Aug 22 16:57:45 2020 (r364486) +++ head/sys/kern/vfs_cache.c Sat Aug 22 16:58:34 2020 (r364487) @@ -1892,10 +1892,12 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, u_long lnumcache; CTR3(KTR_VFS, "cache_enter(%p, %p, %s)", dvp, vp, cnp->cn_nameptr); - VNASSERT(vp == NULL || !VN_IS_DOOMED(vp), vp, - ("cache_enter: Adding a doomed vnode")); - VNASSERT(dvp == NULL || !VN_IS_DOOMED(dvp), dvp, - ("cache_enter: Doomed vnode used as src")); + 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); + } #ifdef DEBUG_CACHE if (__predict_false(!doingcache))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008221658.07MGwYOJ086198>