From owner-svn-src-user@freebsd.org  Wed Aug  3 17:20:36 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 67D6FBAD231
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed,  3 Aug 2016 17:20:36 +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 3B3EA13A1;
 Wed,  3 Aug 2016 17:20:36 +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 u73HKZZZ082507;
 Wed, 3 Aug 2016 17:20:35 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u73HKZQ1082506;
 Wed, 3 Aug 2016 17:20:35 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201608031720.u73HKZQ1082506@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: Wed, 3 Aug 2016 17:20:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r303724 - 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: Wed, 03 Aug 2016 17:20:36 -0000

Author: alc
Date: Wed Aug  3 17:20:35 2016
New Revision: 303724
URL: https://svnweb.freebsd.org/changeset/base/303724

Log:
  Revert the previous change (r303697).  Unfortunately, I'm able to provoke
  cases where "target > 0" but "laundry == 0", resulting in "cycle" getting
  stuck.

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	Wed Aug  3 17:17:01 2016	(r303723)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Wed Aug  3 17:20:35 2016	(r303724)
@@ -1192,14 +1192,13 @@ vm_pageout_laundry_worker(void *arg)
 			launder = target / cycle;
 
 dolaundry:
-		if (launder > 0) {
+		if (launder > 0)
 			target -= min(vm_pageout_launder(domain, launder,
 			    shortfall > 0), target);
-			cycle--;
-		}
 
 		tsleep(&vm_cnt.v_laundry_count, PVM, "laundr",
 		    hz / VM_LAUNDER_INTERVAL);
+		cycle--;
 	}
 }