From owner-p4-projects  Sat Oct  5 12:25:21 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0529F37B404; Sat,  5 Oct 2002 12:25:19 -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 8EB6A37B401
	for <perforce@freebsd.org>; Sat,  5 Oct 2002 12:25:18 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 497AC43E4A
	for <perforce@freebsd.org>; Sat,  5 Oct 2002 12:25:18 -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.6/8.12.6) with ESMTP id g95JPICo047333
	for <perforce@freebsd.org>; Sat, 5 Oct 2002 12:25:18 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g95JPHbY047330
	for perforce@freebsd.org; Sat, 5 Oct 2002 12:25:17 -0700 (PDT)
Date: Sat, 5 Oct 2002 12:25:17 -0700 (PDT)
Message-Id: <200210051925.g95JPHbY047330@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 18753 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=18753

Change 18753 by rwatson@rwatson_tislabs on 2002/10/05 12:24:58

	Manually merge a few cleanups I made when I moved
	mac_check_vnode_link() over to the main tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#298 edit

Differences ...

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

@@ -2261,13 +2261,13 @@
 }
 
 int
-mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct vnode *vp,
-    struct componentname *cnp)
+mac_check_vnode_link(struct ucred *cred, struct vnode *dvp,
+    struct vnode *vp, struct componentname *cnp)
 {
 	int error;
 
-	ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_lookup");
-	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_lookup");
+	ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_link");
+	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_link");
 
 	if (!mac_enforce_fs)
 		return (0);

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