summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_cache.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-06-18 18:09:44 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-06-18 18:09:44 +0000
commit14a75551ab8adecfa8504f866b3039a514eba589 (patch)
tree97bad1a2e1e4f025760e484fea8d1a14281e6c34 /sys/kern/vfs_cache.c
parent3082708bb92c9b5a6ab11c44aaa464f490ba02f3 (diff)
Remove remaining whiteout tentacles; OK deraadt@ miod@ weingart@
Diffstat (limited to 'sys/kern/vfs_cache.c')
-rw-r--r--sys/kern/vfs_cache.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 588af4c9d25..259182ecefb 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_cache.c,v 1.17 2005/05/28 07:28:07 marius Exp $ */
+/* $OpenBSD: vfs_cache.c,v 1.18 2005/06/18 18:09:42 millert Exp $ */
/* $NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $ */
/*
@@ -142,10 +142,6 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
nchstats.ncs_badhits++;
goto remove;
} else if (ncp->nc_vp == NULL) {
- /*
- * Restore the ISWHITEOUT flag saved earlier.
- */
- cnp->cn_flags |= ncp->nc_vpid;
if (cnp->cn_nameiop != CREATE ||
(cnp->cn_flags & ISLASTCN) == 0) {
nchstats.ncs_neghits++;
@@ -368,13 +364,6 @@ cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
ncp->nc_vp = vp;
if (vp)
ncp->nc_vpid = vp->v_id;
- else {
- /*
- * For negative hits, save the ISWHITEOUT flag so we can
- * restore it later when the cache entry is used again.
- */
- ncp->nc_vpid = cnp->cn_flags & ISWHITEOUT;
- }
/* fill in cache info */
ncp->nc_dvp = dvp;
ncp->nc_dvpid = dvp->v_id;