From owner-svn-src-user@FreeBSD.ORG  Sat Feb 21 21:02:53 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3D821065670;
	Sat, 21 Feb 2009 21:02:53 +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 C302B8FC0A;
	Sat, 21 Feb 2009 21:02:53 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1LL2rJH075322;
	Sat, 21 Feb 2009 21:02:53 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1LL2rk3075321;
	Sat, 21 Feb 2009 21:02:53 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902212102.n1LL2rk3075321@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 21 Feb 2009 21:02:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188901 - user/alc/pagelock/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 21:02:54 -0000

Author: alc
Date: Sat Feb 21 21:02:53 2009
New Revision: 188901
URL: http://svn.freebsd.org/changeset/base/188901

Log:
  Eliminate page queues locking from vm_object_page_clean().

Modified:
  user/alc/pagelock/sys/vm/vm_object.c

Modified: user/alc/pagelock/sys/vm/vm_object.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_object.c	Sat Feb 21 20:57:25 2009	(r188900)
+++ user/alc/pagelock/sys/vm/vm_object.c	Sat Feb 21 21:02:53 2009	(r188901)
@@ -740,7 +740,6 @@ vm_object_page_clean(vm_object_t object,
 		tend = end;
 	}
 
-	vm_page_lock_queues();
 	/*
 	 * If the caller is smart and only msync()s a range he knows is
 	 * dirty, we may be able to avoid an object scan.  This results in
@@ -802,7 +801,6 @@ vm_object_page_clean(vm_object_t object,
 		 * return immediately.
 		 */
 		if (tscan >= tend && (tstart || tend < object->size)) {
-			vm_page_unlock_queues();
 			vm_object_clear_flag(object, OBJ_CLEANING);
 			return;
 		}
@@ -889,7 +887,6 @@ again:
 				goto again;
 		}
 	}
-	vm_page_unlock_queues();
 #if 0
 	VOP_FSYNC(vp, (pagerflags & VM_PAGER_PUT_SYNC)?MNT_WAIT:0, curproc);
 #endif
@@ -911,10 +908,8 @@ vm_object_page_collect_flush(vm_object_t
 	vm_page_t mab[vm_pageout_page_count];
 	vm_page_t ma[vm_pageout_page_count];
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	pi = p->pindex;
 	while (vm_page_sleep_if_busy(p, TRUE, "vpcwai")) {
-		vm_page_lock_queues();
 		if (object->generation != curgeneration) {
 			return(0);
 		}
@@ -980,7 +975,9 @@ vm_object_page_collect_flush(vm_object_t
 	}
 	runlen = maxb + maxf + 1;
 
+	vm_page_lock_queues();
 	vm_pageout_flush(ma, runlen, pagerflags);
+	vm_page_unlock_queues();
 	for (i = 0; i < runlen; i++) {
 		if (ma[i]->valid & ma[i]->dirty) {
 			pmap_remove_write(ma[i]);