From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 22:28:19 2007
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 A120C16A40A; Sun, 21 Jan 2007 22:28:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4D1FA16A401
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:28:19 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C28E13C471
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:28:19 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMSJpg060543
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:28:19 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMSJTR060540
	for perforce@freebsd.org; Sun, 21 Jan 2007 22:28:19 GMT
	(envelope-from millert@freebsd.org)
Date: Sun, 21 Jan 2007 22:28:19 GMT
Message-Id: <200701212228.l0LMSJTR060540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113272 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: Sun, 21 Jan 2007 22:28:19 -0000

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

Change 113272 by millert@millert_macbook on 2007/01/21 22:27:59

	Move the mac_system_check_acct() call before the vnode_put()
	so we don't have to do out own vnode locking.  Brings the
	code more in line with FreeBSD.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#10 (text+ko) ====

@@ -1926,6 +1926,15 @@
 		tablefull("file");
 		return (ENFILE);
 	}
+#ifdef MAC
+	error = mac_file_check_create(proc_ucred(p));
+	if (error) {
+		if (!locked)
+			proc_fdunlock(p);
+		return (error);
+	}
+#endif
+
 	/*
 	 * Allocate a new file descriptor.
 	 * If the process has file descriptor zero open, add to the list
@@ -1934,12 +1943,6 @@
 	 */
 	proc_fdunlock(p);
 
-#ifdef MAC
-	error = mac_file_check_create(proc_ucred(p));
-	if (error)
-		return (error);
-#endif
-
 	MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK);
 	MALLOC_ZONE(fg, struct fileglob *, sizeof(struct fileglob), M_FILEGLOB, M_WAITOK);
 	bzero(fp, sizeof(struct fileproc));