From owner-freebsd-stable@FreeBSD.ORG  Tue Jan 13 12:56:05 2004
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id F2BCD16A4CE; Tue, 13 Jan 2004 12:56:04 -0800 (PST)
Received: from bunrab.catwhisker.org
	(adsl-63-193-123-122.dsl.snfc21.pacbell.net [63.193.123.122])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E274443D1F; Tue, 13 Jan 2004 12:56:01 -0800 (PST)
	(envelope-from david@catwhisker.org)
Received: from bunrab.catwhisker.org (localhost [127.0.0.1])
	i0DKu1Gc011392;	Tue, 13 Jan 2004 12:56:01 -0800 (PST)
	(envelope-from david@bunrab.catwhisker.org)
Received: (from david@localhost)
	by bunrab.catwhisker.org (8.12.10/8.12.10/Submit) id i0DKu1YO011391;
	Tue, 13 Jan 2004 12:56:01 -0800 (PST)
	(envelope-from david)
Date: Tue, 13 Jan 2004 12:56:01 -0800 (PST)
From: David Wolfskill <david@catwhisker.org>
Message-Id: <200401132056.i0DKu1YO011391@bunrab.catwhisker.org>
To: fj@panix.com, freebsd-stable@freebsd.org
In-Reply-To: <20040113204738.GA14543@panix.com>
cc: das@freebsd.org
Subject: Re: make buildkernel KERNCONF errors...
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 20:56:05 -0000

Arrggh...  I got so used to -STABLE being, well, "stable" that I sent the
patch to fix this off to -current instead of -stable.  Sorry....  :-(

Anyway, this worked for me on 2 machines, but I don't actually use
unionfs on either one:

Index: sys/miscfs/union/union_vnops.c
===================================================================
RCS file: /cvs/freebsd/src/sys/miscfs/union/Attic/union_vnops.c,v
retrieving revision 1.72.2.2
diff -u -r1.72.2.2 union_vnops.c
--- sys/miscfs/union/union_vnops.c	13 Jan 2004 06:51:55 -0000	1.72.2.2
+++ sys/miscfs/union/union_vnops.c	13 Jan 2004 14:02:09 -0000
@@ -595,7 +595,7 @@
 		 */
 		if (*ap->a_vpp != dvp) {
 			if (!lockparent || (cnp->cn_flags & ISLASTCN) == 0)
-				VOP_UNLOCK(dvp, 0, td);
+				VOP_UNLOCK(dvp, 0, p);
 		}
 
 		if (cnp->cn_namelen == 1 &&


And copying a note from my misdirected post:

["td" is a "struct *thread", from KSE.  What's defined earlier in the
source is "struct *proc p".]

Peace,
david
-- 
David H. Wolfskill				david@catwhisker.org
If you want true virus-protection for your PC, install a non-Microsoft OS
on it.  Plausible candidates include FreeBSD, Linux, NetBSD, OpenBSD, and
Solaris (in alphabetical order).