VFS Lite2 Changes

1 files changed, 2 insertions, 69 deletions

diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 27c551880d4..d5b8e9b15d0 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_node.c,v 1.7 1997/04/18 10:09:46 deraadt Exp $	*/
+/*	$OpenBSD: nfs_node.c,v 1.8 1997/10/06 15:23:41 csapuntz Exp $	*/
 /*	$NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $	*/
 
 /*
@@ -106,9 +106,7 @@ nfs_nget(mntp, fhp, fhsize, npp)
 	int fhsize;
 	struct nfsnode **npp;
 {
-#ifdef Lite2_integrated
 	struct proc *p = curproc;	/* XXX */
-#endif
 	register struct nfsnode *np;
 	struct nfsnodehashhead *nhpp;
 	register struct vnode *vp;
@@ -123,11 +121,7 @@ loop:
 		    bcmp((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize))
 			continue;
 		vp = NFSTOV(np);
-#ifdef Lite2_integrated
 		if (vget(vp, LK_EXCLUSIVE, p))
-#else
-		if (vget(vp, 1))
-#endif
 			goto loop;
 		*npp = np;
 		return(0);
@@ -162,9 +156,7 @@ nfs_inactive(v)
 {
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
-#ifdef Lite2_integrated
 		struct proc *a_p;
-#endif
 	} */ *ap = v;
 	register struct nfsnode *np;
 	register struct sillyrename *sp;
@@ -191,9 +183,8 @@ nfs_inactive(v)
 	}
 	np->n_flag &= (NMODIFIED | NFLUSHINPROG | NFLUSHWANT | NQNFSEVICTED |
 		NQNFSNONCACHE | NQNFSWRITE);
-#ifdef Lite2_integrated
+
 	VOP_UNLOCK(ap->a_vp, 0, ap->a_p);
-#endif
 	return (0);
 }
 
@@ -248,64 +239,6 @@ nfs_reclaim(v)
 	return (0);
 }
 
-#ifndef Lite2_integrated
-/*
- * Lock an nfsnode
- */
-int
-nfs_lock(v)
-	void *v;
-{
-	struct vop_lock_args /* {
-		struct vnode *a_vp;
-	} */ *ap = v;
-	register struct vnode *vp = ap->a_vp;
-
-	/*
-	 * Ugh, another place where interruptible mounts will get hung.
-	 * If you make this sleep interruptible, then you have to fix all
-	 * the VOP_LOCK() calls to expect interruptibility.
-	 */
-	while (vp->v_flag & VXLOCK) {
-		vp->v_flag |= VXWANT;
-		(void) tsleep((caddr_t)vp, PINOD, "nfslck", 0);
-	}
-	if (vp->v_tag == VT_NON)
-		return (ENOENT);
-	return (0);
-}
-
-/*
- * Unlock an nfsnode
- */
-int
-nfs_unlock(v)
-	void *v;
-{
-#if 0
-	struct vop_unlock_args /* {
-		struct vnode *a_vp;
-	} */ *ap = v;
-#endif
-	return (0);
-}
-
-/*
- * Check for a locked nfsnode
- */
-int
-nfs_islocked(v)
-	void *v;
-{
-#if 0
-	struct vop_islocked_args /* {
-		struct vnode *a_vp;
-	} */ *ap = v;
-#endif
-	return (0);
-}
-#endif /* Lite2_integrated */
-
 /*
  * Nfs abort op, called after namei() when a CREATE/DELETE isn't actually
  * done. Currently nothing to do.