From owner-p4-projects@FreeBSD.ORG  Fri May 23 01:12:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95EC71065670; Fri, 23 May 2008 01:12:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57710106564A
	for <perforce@freebsd.org>; Fri, 23 May 2008 01:12:45 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 492378FC18
	for <perforce@freebsd.org>; Fri, 23 May 2008 01:12:45 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4N1CjKD015991
	for <perforce@freebsd.org>; Fri, 23 May 2008 01:12:45 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4N1CjHr015989
	for perforce@freebsd.org; Fri, 23 May 2008 01:12:45 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 23 May 2008 01:12:45 GMT
Message-Id: <200805230112.m4N1CjHr015989@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142082 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: Fri, 23 May 2008 01:12:45 -0000

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

Change 142082 by jb@freebsd3 on 2008/05/23 01:12:01

	Reset to match current.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 (text+ko) ====

@@ -1439,7 +1439,7 @@
 		return (1);
 #endif
 #else
-	if (kmem_used() > (kmem_size() * 4) / 5)
+	if (kmem_used() > (kmem_size() * 3) / 4)
 		return (1);
 #endif
 
@@ -2729,7 +2729,7 @@
 		arc_c_max = (arc_c * 8) - (1<<30);
 	else
 		arc_c_max = arc_c_min;
-	arc_c_max = MAX(arc_c * 6, arc_c_max);
+	arc_c_max = MAX(arc_c * 5, arc_c_max);
 #ifdef _KERNEL
 	/*
 	 * Allow the tunables to override our calculations if they are
@@ -2800,11 +2800,12 @@
 	arc_dead = FALSE;
 
 #ifdef _KERNEL
-	/* Warn about ZFS memory requirements. */
+	/* Warn about ZFS memory and address space requirements. */
 	if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) {
 		printf("ZFS WARNING: Recommended minimum RAM size is 512MB; "
 		    "expect unstable behavior.\n");
-	} else if (kmem_size() < 512 * (1 << 20)) {
+	}
+	if (kmem_size() < 512 * (1 << 20)) {
 		printf("ZFS WARNING: Recommended minimum kmem_size is 512MB; "
 		    "expect unstable behavior.\n");
 		printf("	     Consider tuning vm.kmem_size and "