From owner-p4-projects@FreeBSD.ORG  Mon Apr 14 11:37:33 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43FE537B404; Mon, 14 Apr 2003 11:37:33 -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 D0EA037B401
	for <perforce@freebsd.org>; Mon, 14 Apr 2003 11:37:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7546E43F93
	for <perforce@freebsd.org>; Mon, 14 Apr 2003 11:37:32 -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 h3EIbW0U064068
	for <perforce@freebsd.org>; Mon, 14 Apr 2003 11:37:32 -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 h3EIbVFX064065
	for perforce@freebsd.org; Mon, 14 Apr 2003 11:37:31 -0700 (PDT)
Date: Mon, 14 Apr 2003 11:37:31 -0700 (PDT)
Message-Id: <200304141837.h3EIbVFX064065@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 28941 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: Mon, 14 Apr 2003 18:37:34 -0000

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

Change 28941 by rwatson@rwatson_tislabs on 2003/04/14 11:36:34

	Use MBTOM(), sync whitespace.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#33 edit

Differences ...

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

@@ -566,13 +566,12 @@
 		return (NULL);
 
 	bucket = malloc(sizeof(struct mb_bucket) +
-	    mb_list->ml_objbucks * sizeof(void *), M_MBUF,
-	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    mb_list->ml_objbucks * sizeof(void *), M_MBUF, MBTOM(how));
 	if (bucket == NULL)
 		return (NULL);
 
 	p = (caddr_t)kmem_malloc(mb_list->ml_map, mb_list->ml_objsize * 
-	    mb_list->ml_objbucks, how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    mb_list->ml_objbucks, MBTOM(how));
 	if (p == NULL) {
 		free(bucket, M_MBUF);
 		if (how == M_TRYWAIT)
@@ -1347,7 +1346,7 @@
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
-m_gethdr_clrd(int  how, short type)
+m_gethdr_clrd(int how, short type)
 {
 	struct mbuf *mb;