From owner-svn-src-head@FreeBSD.ORG  Mon May 10 11:53:40 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C050D106566B;
	Mon, 10 May 2010 11:53:40 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id B02FF8FC1B;
	Mon, 10 May 2010 11:53:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4ABre1R043977;
	Mon, 10 May 2010 11:53:40 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4ABregP043975;
	Mon, 10 May 2010 11:53:40 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201005101153.o4ABregP043975@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 10 May 2010 11:53:40 +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: r207846 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 11:53:40 -0000

Author: kib
Date: Mon May 10 11:53:40 2010
New Revision: 207846
URL: http://svn.freebsd.org/changeset/base/207846

Log:
  Continue cleaning the queue instead of moving to the next queue or
  bailing out if acquisition of page lock caused page position in the
  queue to change.
  
  Pointed out by:	alc

Modified:
  head/sys/vm/vm_contig.c

Modified: head/sys/vm/vm_contig.c
==============================================================================
--- head/sys/vm/vm_contig.c	Mon May 10 11:50:26 2010	(r207845)
+++ head/sys/vm/vm_contig.c	Mon May 10 11:53:40 2010	(r207846)
@@ -168,10 +168,8 @@ vm_contig_launder(int queue)
 		if ((m->flags & PG_MARKER) != 0)
 			continue;
 
-		if (!vm_pageout_page_lock(m, &next)) {
-			vm_page_unlock(m);
-			return (FALSE);
-		}
+		if (!vm_pageout_page_lock(m, &next))
+			continue;
 		KASSERT(VM_PAGE_INQUEUE2(m, queue),
 		    ("vm_contig_launder: page %p's queue is not %d", m, queue));
 		error = vm_contig_launder_page(m, &next);