From owner-p4-projects  Fri Aug  9  0:25:23 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C51B37B401; Fri,  9 Aug 2002 00:25:20 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E13E837B400
	for <perforce@freebsd.org>; Fri,  9 Aug 2002 00:25:19 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A111A43E6A
	for <perforce@freebsd.org>; Fri,  9 Aug 2002 00:25:19 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g797PJJU021302
	for <perforce@freebsd.org>; Fri, 9 Aug 2002 00:25:19 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g797PJ8C021299
	for perforce@freebsd.org; Fri, 9 Aug 2002 00:25:19 -0700 (PDT)
Date: Fri, 9 Aug 2002 00:25:19 -0700 (PDT)
Message-Id: <200208090725.g797PJ8C021299@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15722 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15722

Change 15722 by rwatson@rwatson_tislabs on 2002/08/09 00:24:33

	Catch one more merge issue from the integ: vp->v_flag is now
	vp->v_vflag for vnode lock protected flags.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 (text+ko) ====

@@ -882,7 +882,7 @@
 		if (vp == rootvnode || vp == fd_rdir)
 			break;
 		ASSERT_VOP_LOCKED(vp, "vn_fullpath");
-		if (vp->v_flag & VV_ROOT) {
+		if (vp->v_vflag & VV_ROOT) {
 			if (vp->v_mount == NULL) {	/* forced unmount */
 				error = EBADF;
 				goto out;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message