From owner-svn-src-head@FreeBSD.ORG  Fri Apr 30 21:21:21 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 A493B106564A;
	Fri, 30 Apr 2010 21:21:21 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 94BC28FC21;
	Fri, 30 Apr 2010 21:21:21 +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 o3ULLLkg083467;
	Fri, 30 Apr 2010 21:21:21 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3ULLL9I083465;
	Fri, 30 Apr 2010 21:21:21 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004302121.o3ULLL9I083465@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 30 Apr 2010 21:21:21 +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: r207451 - 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: Fri, 30 Apr 2010 21:21:21 -0000

Author: kmacy
Date: Fri Apr 30 21:21:21 2010
New Revision: 207451
URL: http://svn.freebsd.org/changeset/base/207451

Log:
  don't call vm_pageout_flush with the page queue mutex held
  
  Reported by: Michael Butler

Modified:
  head/sys/vm/vm_object.c

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Fri Apr 30 21:20:14 2010	(r207450)
+++ head/sys/vm/vm_object.c	Fri Apr 30 21:21:21 2010	(r207451)
@@ -1058,7 +1058,9 @@ vm_object_page_collect_flush(vm_object_t
 	}
 	runlen = maxb + maxf + 1;
 
+	vm_page_unlock_queues();
 	vm_pageout_flush(ma, runlen, pagerflags);
+	vm_page_lock_queues();
 	for (i = 0; i < runlen; i++) {
 		if (ma[i]->dirty) {
 			vm_page_unlock_queues();