From owner-p4-projects@FreeBSD.ORG  Tue Oct  3 14:32:09 2006
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 BF34816A4C9; Tue,  3 Oct 2006 14:32:09 +0000 (UTC)
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 7DF0416A4A7
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 14:32:09 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 320A743D73
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 14:32:04 +0000 (GMT)
	(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 k93EW45J015579
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 14:32:04 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EW3f0015576
	for perforce@freebsd.org; Tue, 3 Oct 2006 14:32:03 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 3 Oct 2006 14:32:03 GMT
Message-Id: <200610031432.k93EW3f0015576@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 107173 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: Tue, 03 Oct 2006 14:32:10 -0000

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

Change 107173 by millert@millert_macbook on 2006/10/03 14:31:39

	mac_labelzone_alloc() uses MAC_NOWAIT/MAC_WAITOK not
	M_NOWAIT/M_WAITOK so be more consistent with the flags used.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 (text+ko) ====

@@ -57,7 +57,7 @@
 {
 	struct label *label;
 
-	label = mac_labelzone_alloc(M_WAITOK);
+	label = mac_labelzone_alloc(MAC_WAITOK);
 	MAC_PERFORM(pipe_init_label, label);
 	return (label);
 }

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 (text+ko) ====

@@ -374,7 +374,7 @@
 {
 	struct label *label;
 
-	label = mac_labelzone_alloc(M_WAITOK);
+	label = mac_labelzone_alloc(MAC_WAITOK);
 	MAC_PERFORM(lctx_init_label, label);
 	return (label);
 }

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 (text+ko) ====

@@ -533,7 +533,7 @@
 		return (error);
 	}
 
-	intlabel = mac_socket_alloc_label(M_WAITOK);
+	intlabel = mac_socket_alloc_label(MAC_WAITOK);
 	error = mac_socket_internalize_label(intlabel, buffer);
 	FREE(buffer, M_MACTEMP);
 	if (error)
@@ -566,7 +566,7 @@
 	}
 
 	MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-	intlabel = mac_socket_alloc_label(M_WAITOK);
+	intlabel = mac_socket_alloc_label(MAC_WAITOK);
 	mac_socket_copy_label(so->so_label, intlabel);
 	error = mac_socket_externalize_label(intlabel, elements, buffer,
 	    mac->m_buflen);
@@ -603,7 +603,7 @@
 	}
 
 	MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
-	intlabel = mac_socket_alloc_label(M_WAITOK);
+	intlabel = mac_socket_alloc_label(MAC_WAITOK);
 	mac_socket_copy_label(so->so_peerlabel, intlabel);
 	error = mac_socket_peer_externalize_label(intlabel, elements, buffer,
 	    mac->m_buflen);

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
 {
 	struct label *label;
 
-	label = mac_labelzone_alloc(M_WAITOK);
+	label = mac_labelzone_alloc(MAC_WAITOK);
 	MAC_PERFORM(sysvmsg_init_label, label);
 	return (label);
 }
@@ -44,7 +44,7 @@
 {
 	struct label *label;
 
-	label = mac_labelzone_alloc(M_WAITOK);
+	label = mac_labelzone_alloc(MAC_WAITOK);
 	MAC_PERFORM(sysvmsq_init_label, label);
 	return (label);
 }