From owner-svn-src-user@FreeBSD.ORG  Mon Apr 26 23:57:07 2010
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 DD36C1065673;
	Mon, 26 Apr 2010 23:57:07 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE0A78FC15;
	Mon, 26 Apr 2010 23:57:07 +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 o3QNv745038355;
	Mon, 26 Apr 2010 23:57:07 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3QNv7HU038353;
	Mon, 26 Apr 2010 23:57:07 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004262357.o3QNv7HU038353@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 26 Apr 2010 23:57:07 +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: r207253 - user/kmacy/head_page_lock_2/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: Mon, 26 Apr 2010 23:57:07 -0000

Author: kmacy
Date: Mon Apr 26 23:57:07 2010
New Revision: 207253
URL: http://svn.freebsd.org/changeset/base/207253

Log:
  sync whitespace and hold_count check with head

Modified:
  user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 26 21:10:10 2010	(r207252)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 26 23:57:07 2010	(r207253)
@@ -306,6 +306,7 @@ vm_pageout_clean(vm_page_t m)
 		vm_page_unlock(m);
 		return 0;
 	}
+
 	mc[vm_pageout_page_count] = m;
 	pageout_count = 1;
 	page_base = vm_pageout_page_count;
@@ -777,13 +778,14 @@ rescan0:
 		 * queue, most likely are being paged out.
 		 */
 		if (!VM_OBJECT_TRYLOCK(object) &&
-		    !vm_pageout_fallback_object_lock(m, &next)) {
+		    (!vm_pageout_fallback_object_lock(m, &next) ||
+			m->hold_count != 0)) {
 			VM_OBJECT_UNLOCK(object);
 			vm_page_unlock(m);
 			addl_page_shortage++;
 			continue;
 		}
-		if (m->busy || (m->oflags & VPO_BUSY) || m->hold_count) {
+		if (m->busy || (m->oflags & VPO_BUSY)) {
 			vm_page_unlock(m);
 			VM_OBJECT_UNLOCK(object);
 			addl_page_shortage++;