From owner-svn-src-user@FreeBSD.ORG  Sat Jun 27 20:48:01 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 41A0F1065680;
	Sat, 27 Jun 2009 20:48:01 +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 3062D8FC12;
	Sat, 27 Jun 2009 20:48:01 +0000 (UTC)
	(envelope-from kmacy@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 n5RKlx4X087797;
	Sat, 27 Jun 2009 20:47:59 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5RKlx6d087795;
	Sat, 27 Jun 2009 20:47:59 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906272047.n5RKlx6d087795@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 27 Jun 2009 20:47:59 +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: r195116 - user/kmacy/releng_7_2_fcs/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, 27 Jun 2009 20:48:01 -0000

Author: kmacy
Date: Sat Jun 27 20:47:59 2009
New Revision: 195116
URL: http://svn.freebsd.org/changeset/base/195116

Log:
  - make page trylock acquisition style the same as object trylock
  - fix missed re-ordering of page and object lock

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

Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c	Sat Jun 27 20:26:16 2009	(r195115)
+++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c	Sat Jun 27 20:47:59 2009	(r195116)
@@ -775,7 +775,7 @@ rescan0:
 			continue;
 		}
 
-		if (vm_page_trylock(m) == 0 || (object = m->object) == NULL) {
+		if (!vm_page_trylock(m) || (object = m->object) == NULL) {
 			addl_page_shortage++;
 			continue;
 		}
@@ -1102,7 +1102,7 @@ unlock_and_continue:
 			continue;
 		}
 
-		if (vm_page_trylock(m) == 0 || (object = m->object) == NULL) {
+		if (!vm_page_trylock(m) || (object = m->object) == NULL) {
 			m = next;
 			continue;
 		}
@@ -1344,15 +1344,15 @@ vm_pageout_page_stats()
 			m = next;
 			continue;
 		}
-		if (!VM_OBJECT_TRYLOCK(object) &&
-		    !vm_pageout_fallback_object_lock(m, &next)) {
-			VM_OBJECT_UNLOCK(object);
+		vm_page_lock_assert(m, MA_NOTOWNED);
+		if (!vm_page_trylock(m) || (object = m->object) == NULL) {
 			m = next;
 			continue;
 		}
-		vm_page_lock_assert(m, MA_NOTOWNED);
-		if (vm_page_trylock(m) == 0) {
+		if (!VM_OBJECT_TRYLOCK(object) &&
+		    !vm_pageout_fallback_object_lock(m, &next)) {
 			VM_OBJECT_UNLOCK(object);
+			vm_page_unlock(m);
 			m = next;
 			continue;
 		}