From owner-svn-src-user@freebsd.org  Sat Oct  8 00:07:22 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 30782C05D6B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sat,  8 Oct 2016 00:07:22 +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 EA566617;
 Sat,  8 Oct 2016 00:07:21 +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 u9807LVV083503;
 Sat, 8 Oct 2016 00:07:21 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9807Lrd083502;
 Sat, 8 Oct 2016 00:07:21 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201610080007.u9807Lrd083502@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: Sat, 8 Oct 2016 00:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r306835 - 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.23
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: Sat, 08 Oct 2016 00:07:22 -0000

Author: alc
Date: Sat Oct  8 00:07:20 2016
New Revision: 306835
URL: https://svnweb.freebsd.org/changeset/base/306835

Log:
  Revert one line of r306595.  The variable "shortfall" is reset each time
  that the laundry thread wakes up, so it can't be used to tell if a shortfall
  laundering is in progress.
  
  Reviewed by:	markj

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	Sat Oct  8 00:01:07 2016	(r306834)
+++ user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c	Sat Oct  8 00:07:20 2016	(r306835)
@@ -1217,7 +1217,7 @@ dolaundry:
 			 * a cluster minus one. 
 			 */
 			target -= min(vm_pageout_launder(domain, launder,
-			    shortfall > 0), target);
+			    prev_shortfall > 0), target);
 
 		/*
 		 * Sleep for a little bit if we're in the middle of a laundering