From owner-p4-projects  Wed Dec 11 12:14:39 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9ABE337B404; Wed, 11 Dec 2002 12:14:37 -0800 (PST)
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 3298837B401
	for <perforce@freebsd.org>; Wed, 11 Dec 2002 12:14:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7A61C43EC2
	for <perforce@freebsd.org>; Wed, 11 Dec 2002 12:14:36 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBBK9imV072090
	for <perforce@freebsd.org>; Wed, 11 Dec 2002 12:09:44 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBBK9hXc072087
	for perforce@freebsd.org; Wed, 11 Dec 2002 12:09:43 -0800 (PST)
Date: Wed, 11 Dec 2002 12:09:43 -0800 (PST)
Message-Id: <200212112009.gBBK9hXc072087@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 22166 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://perforce.freebsd.org/chv.cgi?CH=22166

Change 22166 by green@green_laptop_2 on 2002/12/11 12:09:34

	Correct both invocations of devfs_fqpn() to use the directory's
	dirent and not the file's.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#39 edit

Differences ...

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

@@ -95,6 +95,7 @@
 {
 	int i;
 
+	KASSERT(de->de_dirent->d_type == DT_DIR, ("devfs_fqpn: de not DT_DIR"));
 	i = buflen - 1;
 	buf[i] = '\0';
 	i -= namelen;
@@ -362,7 +363,7 @@
 	 * OK, we didn't have an entry for the name we were asked for
 	 * so we try to see if anybody can create it on demand.
 	 */
-	pname = devfs_fqpn(specname, sizeof(specname), dmp, de,
+	pname = devfs_fqpn(specname, sizeof(specname), dmp, dd,
 	    cnp->cn_nameptr, cnp->cn_namelen);
 	if (pname == NULL)
 		goto notfound;
@@ -875,7 +876,7 @@
 #ifdef MAC
 	mac_create_devfs_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de,
 	    devfs_fqpn(specname, SPECNAMELEN + ap->a_cnp->cn_namelen + 1,
-	    dmp, de, ap->a_cnp->cn_nameptr, ap->a_cnp->cn_namelen));
+	    dmp, dd, ap->a_cnp->cn_nameptr, ap->a_cnp->cn_namelen));
 	free(specname, M_DEVFS);
 #endif
 	TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list);

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