From owner-svn-src-user@FreeBSD.ORG  Thu May 21 03:35:02 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D09051065673;
	Thu, 21 May 2009 03:35:02 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BECDC8FC1A;
	Thu, 21 May 2009 03:35:02 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4L3Z2rf053412;
	Thu, 21 May 2009 03:35:02 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4L3Z2jm053411;
	Thu, 21 May 2009 03:35:02 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905210335.n4L3Z2jm053411@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 21 May 2009 03:35:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192516 -
	user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2009 03:35:03 -0000

Author: kmacy
Date: Thu May 21 03:35:02 2009
New Revision: 192516
URL: http://svn.freebsd.org/changeset/base/192516

Log:
  change prioritization of arc_reclaim handling a bit so that we don't get
  compressed down to nothing by the inactive queue

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu May 21 02:47:46 2009	(r192515)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu May 21 03:35:02 2009	(r192516)
@@ -1820,15 +1820,16 @@ arc_reclaim_needed(void)
 #endif
 
 #ifdef _KERNEL
+	if (needfree)
+		return (1);
 
+	if (arc_size <= arc_c_min)
+		return (0);
 	/*
-	 * If pages are needed or we're within 2048 pages 
-	 * of needing to page need to reclaim
+	 * If pages are needed and we're using more than half
+	 * of kmem ... be charitable
 	 */
-	if (vm_pages_needed || (vm_paging_target() > -2048))
-		return (1);
-
-	if (needfree)
+	if (vm_pages_needed && (arc_size > kmem_size()/2))
 		return (1);
 
 #if 0