back out vnode parents. weird breakge found in ports tree

3 files changed, 3 insertions, 12 deletions

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 5174da110a9..793f06760c8 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.96 2004/01/06 04:22:59 tedu Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.97 2004/01/09 03:01:03 tedu Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -1052,10 +1052,6 @@ vclean(vp, flags, p)
 	/*
 	 * Reclaim the vnode.
 	 */
-	if (vp->v_parent) {
-		vrele(vp->v_parent);
-		vp->v_parent = NULL;
-	}
 	if (VOP_RECLAIM(vp, p))
 		panic("vclean: cannot reclaim");
 	if (active) {
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 7004d901390..8f12361e168 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.57 2004/01/06 04:22:59 tedu Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.58 2004/01/09 03:01:03 tedu Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -112,7 +112,6 @@ struct vnode {
 	struct	lock v_lock;
 	struct  lock *v_vnlock;			/* used for non-locking fs's */
 	enum	vtagtype v_tag;			/* type of underlying data */
-	struct	vnode *v_parent;		/* parent directory */
 	void	*v_data;			/* private data for fs */
 	struct {
 		struct	simplelock vsi_lock;	/* lock to protect below */
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 7340d071ad3..0b05f1dd2ef 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_lookup.c,v 1.24 2004/01/06 04:22:59 tedu Exp $	*/
+/*	$OpenBSD: ufs_lookup.c,v 1.25 2004/01/09 03:01:03 tedu Exp $	*/
 /*	$NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $	*/
 
 /*
@@ -624,10 +624,6 @@ found:
 			VOP_UNLOCK(pdp, 0, p);
 			cnp->cn_flags |= PDIRUNLOCK;
 		}
-		vref(vdp);
-		if (tdp->v_parent)
-			vrele(tdp->v_parent);
-		tdp->v_parent = vdp;
 		*vpp = tdp;
 	}