aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/vfs_cache.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 5b0cd64146ad..0f4d7526ebb5 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -542,7 +542,6 @@ STATNODE_COUNTER(negzaps, numnegzaps,
STATNODE_COUNTER(neghits, numneghits, "Number of cache hits (negative)");
/* These count for vn_getcwd(), too. */
STATNODE_COUNTER(fullpathcalls, numfullpathcalls, "Number of fullpath search calls");
-STATNODE_COUNTER(fullpathfail1, numfullpathfail1, "Number of fullpath search errors (ENOTDIR)");
STATNODE_COUNTER(fullpathfail2, numfullpathfail2,
"Number of fullpath search errors (VOP_VPTOCNP failures)");
STATNODE_COUNTER(fullpathfail4, numfullpathfail4, "Number of fullpath search errors (ENOMEM)");
@@ -3400,14 +3399,7 @@ vn_fullpath_dir(struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf,
vp = vp1;
continue;
}
- if (vp->v_type != VDIR) {
- vrele(vp);
- counter_u64_add(numfullpathfail1, 1);
- error = ENOTDIR;
- SDT_PROBE3(vfs, namecache, fullpath, return,
- error, vp, NULL);
- break;
- }
+ VNPASS(vp->v_type == VDIR || VN_IS_DOOMED(vp), vp);
error = vn_vptocnp(&vp, buf, &buflen);
if (error)
break;