From owner-freebsd-current@FreeBSD.ORG  Tue Jan 13 06:13:39 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D2A0416A4CE; Tue, 13 Jan 2004 06:13:39 -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 D197D43D49; Tue, 13 Jan 2004 06:13:38 -0800 (PST)
	(envelope-from david@catwhisker.org)
Received: from bunrab.catwhisker.org (localhost [127.0.0.1])
	i0DEDcGc009323;	Tue, 13 Jan 2004 06:13:38 -0800 (PST)
	(envelope-from david@bunrab.catwhisker.org)
Received: (from david@localhost)
	by bunrab.catwhisker.org (8.12.10/8.12.10/Submit) id i0DEDcFx009322;
	Tue, 13 Jan 2004 06:13:38 -0800 (PST)
	(envelope-from david)
Date: Tue, 13 Jan 2004 06:13:38 -0800 (PST)
From: David Wolfskill <david@catwhisker.org>
Message-Id: <200401131413.i0DEDcFx009322@bunrab.catwhisker.org>
To: current@freebsd.org
cc: das@freebsd.org
Subject: [Patch] fix for unionfs comile problem
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 14:13:40 -0000

Looks as if the MFC for union_vnops.c needs a tiny bit of help:

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 &&


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

Note:  I do not actually *use* unionfs on this system, but it does
compile:

freebeast(4.9-S)[1] uname -a
FreeBSD freebeast.catwhisker.org 4.9-STABLE FreeBSD 4.9-STABLE #779: Tue Jan 13 05:34:51 PST 2004     root@freebeast.catwhisker.org:/common/S1/obj/usr/src/sys/FREEBEAST  i386
freebeast(4.9-S)[2] 


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).