From owner-p4-projects@FreeBSD.ORG  Thu Nov 10 15:03:03 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AE3816A422; Thu, 10 Nov 2005 15:03:02 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 3950416A41F
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 15:03:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 03E4443D46
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 15:03:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAAF31DF092105
	for <perforce@freebsd.org>; Thu, 10 Nov 2005 15:03:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAAF31Up092102
	for perforce@freebsd.org; Thu, 10 Nov 2005 15:03:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 10 Nov 2005 15:03:01 GMT
Message-Id: <200511101503.jAAF31Up092102@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86599 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2005 15:03:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=86599

Change 86599 by rwatson@rwatson_zoo on 2005/11/10 15:02:32

	Fix a merge nit and pass the new name for 'dev' into the MAC
	Framework.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#23 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#23 (text+ko) ====

@@ -417,7 +417,7 @@
 		de->de_cdp = cdp;
 #ifdef MAC
 		mac_create_devfs_device(cdp->cdp_c.si_cred, dm->dm_mount,
-		    &cdp->cdp_c, de, dev->si_name);
+		    &cdp->cdp_c, de, cdp->cdp_c.si_name);
 #endif
 		de->de_dir = dd;
 		TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list);