From owner-svn-src-user@freebsd.org  Mon Aug  8 19:59:09 2016
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 9C9D2BB2A1A
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon,  8 Aug 2016 19:59:09 +0000 (UTC)
 (envelope-from markj@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 6B5D51374;
 Mon,  8 Aug 2016 19:59:09 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u78Jx8QN037782;
 Mon, 8 Aug 2016 19:59:08 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u78Jx8Yh037781;
 Mon, 8 Aug 2016 19:59:08 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201608081959.u78Jx8Yh037781@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 8 Aug 2016 19:59:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r303851 - 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.22
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: Mon, 08 Aug 2016 19:59:09 -0000

Author: markj
Date: Mon Aug  8 19:59:08 2016
New Revision: 303851
URL: https://svnweb.freebsd.org/changeset/base/303851

Log:
  Reset the laundering target if we haven't met it after the last cycle.
  
  Reviewed by:	alc

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	Mon Aug  8 19:44:13 2016	(r303850)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Mon Aug  8 19:59:08 2016	(r303851)
@@ -1165,8 +1165,12 @@ vm_pageout_laundry_worker(void *arg)
 			 */
 			target = min(target, bkgrd_launder_max);
 		}
-		if (target > 0 && cycle != 0)
-			launder = target / cycle--;
+		if (target > 0) {
+			if (cycle != 0)
+				launder = target / cycle--;
+			else
+				target = 0;
+		}
 
 dolaundry:
 		if (launder > 0)