From owner-svn-src-all@FreeBSD.ORG  Tue Aug  7 04:48:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 417F5106564A;
	Tue,  7 Aug 2012 04:48:15 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BD6A8FC0C;
	Tue,  7 Aug 2012 04:48:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q774mE28021714;
	Tue, 7 Aug 2012 04:48:14 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q774mE2n021712;
	Tue, 7 Aug 2012 04:48:14 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201208070448.q774mE2n021712@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 7 Aug 2012 04:48:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239121 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2012 04:48:15 -0000

Author: alc
Date: Tue Aug  7 04:48:14 2012
New Revision: 239121
URL: http://svn.freebsd.org/changeset/base/239121

Log:
  Never sleep on busy pages in vm_pageout_launder(), always skip them.  Long
  ago, sleeping on busy pages in vm_pageout_launder() made sense.  The call
  to vm_pageout_flush() specified asynchronous I/O and sleeping on busy pages
  blocked vm_pageout_launder() until the flush had completed.  However, in
  CVS revision 1.35 of vm/vm_contig.c, the call to vm_pageout_flush() was
  changed to request synchronous I/O, but the sleep on busy pages was not
  removed.

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Tue Aug  7 00:42:46 2012	(r239120)
+++ head/sys/vm/vm_pageout.c	Tue Aug  7 04:48:14 2012	(r239121)
@@ -586,23 +586,14 @@ vm_pageout_launder(int queue, int tries,
 			continue;
 		}
 		object = m->object;
-		if (!VM_OBJECT_TRYLOCK(object) &&
+		if ((!VM_OBJECT_TRYLOCK(object) &&
 		    (!vm_pageout_fallback_object_lock(m, &next) ||
-		    m->hold_count != 0)) {
+		    m->hold_count != 0)) || (m->oflags & VPO_BUSY) != 0 ||
+		    m->busy != 0) {
 			vm_page_unlock(m);
 			VM_OBJECT_UNLOCK(object);
 			continue;
 		}
-		if ((m->oflags & VPO_BUSY) != 0 || m->busy != 0) {
-			if (tries == 0) {
-				vm_page_unlock(m);
-				VM_OBJECT_UNLOCK(object);
-				continue;
-			}
-			vm_page_sleep(m, "vpctw0");
-			VM_OBJECT_UNLOCK(object);
-			return (FALSE);
-		}
 		vm_page_test_dirty(m);
 		if (m->dirty == 0)
 			pmap_remove_all(m);