svn commit: r303724 - user/alc/PQ_LAUNDRY/sys/vm

[Alan Cox]

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--;
 	}
 }