From owner-p4-projects@FreeBSD.ORG  Tue Apr 15 12:32:23 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1457E37B404; Tue, 15 Apr 2003 12:32:23 -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 A392C37B401
	for <perforce@freebsd.org>; Tue, 15 Apr 2003 12:32:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 926F643F93
	for <perforce@freebsd.org>; Tue, 15 Apr 2003 12:32:21 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3FJWL0U030171
	for <perforce@freebsd.org>; Tue, 15 Apr 2003 12:32:21 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3FJWLBV030168
	for perforce@freebsd.org; Tue, 15 Apr 2003 12:32:21 -0700 (PDT)
Date: Tue, 15 Apr 2003 12:32:21 -0700 (PDT)
Message-Id: <200304151932.h3FJWLBV030168@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>
Subject: PERFORCE change 29006 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 15 Apr 2003 19:32:24 -0000

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

Change 29006 by rwatson@rwatson_tislabs on 2003/04/15 12:32:01

	mac_init_mbuf_tag() accepts malloc flags, not mbuf allocator
	flags, so no need to map them.

Affected files ...

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

Differences ...

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

@@ -783,13 +783,12 @@
 mac_init_mbuf_tag(struct m_tag *tag, int flag)
 {
 	struct label *label;
-	int error, trflag;
+	int error;
 
 	label = (struct label *) (tag + 1);
 	mac_init_label(label);
 
-	trflag = (flag == M_DONTWAIT ? M_NOWAIT : M_WAITOK);
-	MAC_CHECK(init_mbuf_label, label, trflag);
+	MAC_CHECK(init_mbuf_label, label, flag);
 	if (error) {
 		MAC_PERFORM(destroy_mbuf_label, label);
 		mac_destroy_label(label);