From owner-svn-src-all@FreeBSD.ORG  Tue Jul 20 13:59:51 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F1721065675;
	Tue, 20 Jul 2010 13:59:51 +0000 (UTC)
	(envelope-from ivoras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EE9B8FC14;
	Tue, 20 Jul 2010 13:59:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6KDxpX8013559;
	Tue, 20 Jul 2010 13:59:51 GMT (envelope-from ivoras@svn.freebsd.org)
Received: (from ivoras@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6KDxptc013557;
	Tue, 20 Jul 2010 13:59:51 GMT (envelope-from ivoras@svn.freebsd.org)
Message-Id: <201007201359.o6KDxptc013557@svn.freebsd.org>
From: Ivan Voras <ivoras@FreeBSD.org>
Date: Tue, 20 Jul 2010 13:59:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210295 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jul 2010 13:59:51 -0000

Author: ivoras
Date: Tue Jul 20 13:59:51 2010
New Revision: 210295
URL: http://svn.freebsd.org/changeset/base/210295

Log:
  Fix expression style.
  
  Prodded by: jhb

Modified:
  head/sys/kern/vfs_bio.c

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Tue Jul 20 12:36:36 2010	(r210294)
+++ head/sys/kern/vfs_bio.c	Tue Jul 20 13:59:51 2010	(r210295)
@@ -621,9 +621,8 @@ bufinit(void)
 	lobufspace = hibufspace - MAXBSIZE;
 
 	lorunningspace = 512 * 1024;
-	hirunningspace = lmin(roundup(hibufspace/64, MAXBSIZE), 16*1024*1024);
-	if (hirunningspace < 1024 * 1024)
-		hirunningspace = 1024 * 1024;
+	hirunningspace = lmax(lmin(roundup(hibufspace / 64, MAXBSIZE),
+	    16 * 1024 * 1024), 1024 * 1024);
 
 /*
  * Limit the amount of malloc memory since it is wired permanently into