From c4ace78562c79138b57a40fa912ad35f0e07e441 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Sun, 27 Apr 1997 10:49:37 +0000
Subject: [PATCH] Undo 1.29.

---
 sys/fs/unionfs/union_vnops.c   | 4 ++--
 sys/miscfs/union/union_vnops.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index f80a07f84ca..f8c829387c7 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.28 1997/04/26 04:09:40 kato Exp $
+ * $Id: union_vnops.c,v 1.29 1997/04/26 13:43:25 kato Exp $
  */
 
 #include <sys/param.h>
@@ -1480,12 +1480,12 @@ start:
 			if (VOP_ISLOCKED(un->un_uppervp)) {
 				/*
 				 * Erm, we find race!
-				 * Do nothing here.
 				 */
 #ifdef DIAGNOSTIC
 				panic("union_link: upper vnode is locked, "
 					  "but UN_UNLOCK is not set.");
 #endif
+				un->un_flags |= UN_ULOCK;	/* XXX */
 			} else {
 				error = vn_lock(un->un_uppervp, flags, p);
 				if (error)
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index f80a07f84ca..f8c829387c7 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.28 1997/04/26 04:09:40 kato Exp $
+ * $Id: union_vnops.c,v 1.29 1997/04/26 13:43:25 kato Exp $
  */
 
 #include <sys/param.h>
@@ -1480,12 +1480,12 @@ start:
 			if (VOP_ISLOCKED(un->un_uppervp)) {
 				/*
 				 * Erm, we find race!
-				 * Do nothing here.
 				 */
 #ifdef DIAGNOSTIC
 				panic("union_link: upper vnode is locked, "
 					  "but UN_UNLOCK is not set.");
 #endif
+				un->un_flags |= UN_ULOCK;	/* XXX */
 			} else {
 				error = vn_lock(un->un_uppervp, flags, p);
 				if (error)