From owner-svn-src-head@FreeBSD.ORG Wed Jul 24 01:25:57 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F400C6C; Wed, 24 Jul 2013 01:25:56 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E5A7A20F3; Wed, 24 Jul 2013 01:25:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O1PuOq043671; Wed, 24 Jul 2013 01:25:56 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O1PuQG043670; Wed, 24 Jul 2013 01:25:56 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201307240125.r6O1PuQG043670@svn.freebsd.org> From: Jeff Roberson Date: Wed, 24 Jul 2013 01:25:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253587 - head/sys/vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jul 2013 01:25:57 -0000 Author: jeff Date: Wed Jul 24 01:25:56 2013 New Revision: 253587 URL: http://svnweb.freebsd.org/changeset/base/253587 Log: - Remove the long obsolete 'vm_pageout_algorithm' experiment. Discussed with: alc Sponsored by: EMC / Isilon Storage Division Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Wed Jul 24 01:08:45 2013 (r253586) +++ head/sys/vm/vm_pageout.c Wed Jul 24 01:25:56 2013 (r253587) @@ -157,7 +157,6 @@ static int vm_pageout_stats; static int vm_pageout_stats_interval; static int vm_pageout_full_stats; static int vm_pageout_full_stats_interval; -static int vm_pageout_algorithm; static int defer_swap_pageouts; static int disable_swap_pageouts; @@ -169,9 +168,6 @@ static int vm_swap_enabled = 1; static int vm_swap_idle_enabled = 0; #endif -SYSCTL_INT(_vm, VM_PAGEOUT_ALGORITHM, pageout_algorithm, - CTLFLAG_RW, &vm_pageout_algorithm, 0, "LRU page mgmt"); - SYSCTL_INT(_vm, OID_AUTO, max_launder, CTLFLAG_RW, &vm_max_launder, 0, "Limit dirty flushes in pageout"); @@ -756,9 +752,7 @@ vm_pageout_object_deactivate_pages(pmap_ if (actcount == 0) { p->act_count -= min(p->act_count, ACT_DECLINE); - if (!remove_mode && - (vm_pageout_algorithm || - p->act_count == 0)) { + if (!remove_mode && p->act_count == 0) { pmap_remove_all(p); vm_page_deactivate(p); } else @@ -1356,8 +1350,7 @@ relock_queues: vm_page_requeue_locked(m); else { m->act_count -= min(m->act_count, ACT_DECLINE); - if (vm_pageout_algorithm || - object->ref_count == 0 || + if (object->ref_count == 0 || m->act_count == 0) { page_shortage--; /* Dequeue to avoid later lock recursion. */