From owner-svn-src-user@FreeBSD.ORG  Tue May 26 21:34:43 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 BA63D10656BA;
	Tue, 26 May 2009 21:34:43 +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 AA02F8FC12;
	Tue, 26 May 2009 21:34:43 +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 n4QLYhuV074389;
	Tue, 26 May 2009 21:34:43 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QLYhbc074388;
	Tue, 26 May 2009 21:34:43 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905262134.n4QLYhbc074388@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 26 May 2009 21:34:43 +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: r192858 - 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: Tue, 26 May 2009 21:34:44 -0000

Author: kmacy
Date: Tue May 26 21:34:43 2009
New Revision: 192858
URL: http://svn.freebsd.org/changeset/base/192858

Log:
  - remove write and start I/O on the current page
  - move assert down below goto target

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	Tue May 26 21:20:42 2009	(r192857)
+++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c	Tue May 26 21:34:43 2009	(r192858)
@@ -304,7 +304,7 @@ vm_pageout_clean(m)
 	if ((m->hold_count != 0) ||
 	    ((m->busy != 0) || (m->oflags & VPO_BUSY))) {
 		vm_page_unlock(m);
-		return 0;
+		return (0);
 	}
 	vm_page_io_start(m);
 	pmap_remove_write(m);
@@ -362,8 +362,8 @@ more:
 			vm_page_unlock(p);
 			break;
 		}
-		vm_page_io_start(m);
-		pmap_remove_write(m);
+		vm_page_io_start(p);
+		pmap_remove_write(p);
 		vm_page_unlock(p);
 		mc[--page_base] = p;
 		++pageout_count;
@@ -394,8 +394,8 @@ more:
 			vm_page_unlock(p);
 			break;
 		}
-		vm_page_io_start(m);
-		pmap_remove_write(m);
+		vm_page_io_start(p);
+		pmap_remove_write(p);
 		vm_page_unlock(p);
 		mc[page_base + pageout_count] = p;
 		++pageout_count;
@@ -987,8 +987,8 @@ rescan0:
 					goto unlock_and_continue;
 				}
 				VM_OBJECT_LOCK(object);
-				vm_page_lock(m);
 				vm_page_lock_queues();
+				vm_page_lock(m);
 				/*
 				 * The page might have been moved to another
 				 * queue during potential blocking in vget()
@@ -1043,9 +1043,9 @@ rescan0:
 				--page_shortage;
 				--maxlaunder;
 			} 
-			vm_page_lock_assert(m, MA_NOTOWNED);
 			vm_page_lock_queues();
 unlock_and_continue:
+			vm_page_lock_assert(m, MA_NOTOWNED);
 			VM_OBJECT_UNLOCK(object);
 			if (mp != NULL) {
 				vm_page_unlock_queues();