From 2c5c3a27748845755ed37cc90129a5028492fb47 Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Tue, 4 Jan 1994 14:10:48 +0000
Subject: [PATCH] add support for union and loopback mounts, from jsp

---
 sys/kern/vfs_lookup.c   |  2 +-
 sys/kern/vfs_syscalls.c |  2 +-
 sys/nfs/nfs_vnops.c     | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index a6e3f2871612..37ba0a781f5b 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1 +1 @@
-revision 1.7 intentionally removed
+revision 1.8 intentionally removed
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index b5140f51032b..35e79b1287b4 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1 +1 @@
-revision 1.11 intentionally removed
+revision 1.12 intentionally removed
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 2dcabbc41df1..76632b31d673 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfs_vnops.c	7.60 (Berkeley) 5/24/91
- *	$Id: nfs_vnops.c,v 1.17 1993/12/22 13:03:22 cgd Exp $
+ *	$Id: nfs_vnops.c,v 1.18 1994/01/04 14:11:04 cgd Exp $
  */
 
 /*
@@ -1029,7 +1029,13 @@ nfs_link(vp, ndp, p)
 	struct mbuf *mreq, *mrep, *md, *mb, *mb2;
 
 	if (vp->v_mount != ndp->ni_dvp->v_mount) {
-		free(ndp->ni_pnbuf, M_NAMEI);
+		VOP_ABORTOP(ndp);
+		if (ndp->ni_dvp == ndp->ni_vp)
+			vrele(ndp->ni_dvp);
+		else
+			vput(ndp->ni_dvp);
+		if (ndp->ni_vp)
+			vrele(ndp->ni_vp);
 		return (EXDEV);
 	}
 	if (ndp->ni_dvp != vp)