From owner-svn-src-user@freebsd.org  Fri Oct 16 08:00:23 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2977A16531
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 16 Oct 2015 08:00:23 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BD0012F0;
 Fri, 16 Oct 2015 08:00:23 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9G80MQS034549;
 Fri, 16 Oct 2015 08:00:22 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9G80MC8034548;
 Fri, 16 Oct 2015 08:00:22 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201510160800.t9G80MC8034548@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org
 using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 16 Oct 2015 08:00:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r289412 - user/alc/PQ_LAUNDRY/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2015 08:00:23 -0000

Author: alc
Date: Fri Oct 16 08:00:22 2015
New Revision: 289412
URL: https://svnweb.freebsd.org/changeset/base/289412

Log:
  Update vm_pageout_worker() to reflect the fact that dirty page laundering
  no longer occurs in vm_pageout_scan().

Modified:
  user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c

Modified: user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Oct 16 05:59:59 2015	(r289411)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Fri Oct 16 08:00:22 2015	(r289412)
@@ -1775,13 +1775,12 @@ vm_pageout_worker(void *arg)
 			 * set by another thread during the previous scan
 			 * (typically, this happens during a level 0 scan) or
 			 * vm_pages_needed was already set and the scan failed
-			 * to free enough pages.  If we haven't yet performed
-			 * a level >= 2 scan (unlimited dirty cleaning), then
-			 * upgrade the level and scan again now.  Otherwise,
-			 * sleep a bit and try again later.  While sleeping,
-			 * vm_pages_needed can be cleared.
+			 * to free enough pages.  If we've only performed a
+			 * level 0 scan, then upgrade the level and scan again
+			 * now.  Otherwise, sleep a bit and try again later.
+			 * While sleeping, vm_pages_needed can be cleared.
 			 */
-			if (domain->vmd_pass > 1)
+			if (domain->vmd_pass > 0)
 				msleep(&vm_pages_needed,
 				    &vm_page_queue_free_mtx, PVM, "psleep",
 				    hz / 2);