From owner-svn-src-user@FreeBSD.ORG  Mon Apr 19 19:06:41 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 9C75B1065742;
	Mon, 19 Apr 2010 19:06:41 +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 8BD4E8FC1E;
	Mon, 19 Apr 2010 19:06:41 +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 o3JJ6fXP088630;
	Mon, 19 Apr 2010 19:06:41 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JJ6ffS088628;
	Mon, 19 Apr 2010 19:06:41 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004191906.o3JJ6ffS088628@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 19 Apr 2010 19:06:41 +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: r206853 - 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, 19 Apr 2010 19:06:41 -0000

Author: kmacy
Date: Mon Apr 19 19:06:41 2010
New Revision: 206853
URL: http://svn.freebsd.org/changeset/base/206853

Log:
  - add assert to rename
  - lock cowfault

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

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_page.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_page.c	Mon Apr 19 19:06:10 2010	(r206852)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_page.c	Mon Apr 19 19:06:41 2010	(r206853)
@@ -818,6 +818,7 @@ void
 vm_page_rename(vm_page_t m, vm_object_t new_object, vm_pindex_t new_pindex)
 {
 
+	vm_page_lock_assert(m, MA_OWNED);
 	vm_page_remove(m);
 	vm_page_insert(m, new_object, new_pindex);
 	vm_page_dirty(m);
@@ -2234,10 +2235,9 @@ vm_page_cowfault(vm_page_t m)
 	vm_object_t object;
 	vm_pindex_t pindex;
 
-	/* XXX Not properly locked. */
-	panic("vm_page_cowfault: Not properly locked\n");
 	object = m->object;
 	VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
+	vm_page_lock_assert(m, MA_OWNED);
 	KASSERT(object->paging_in_progress != 0,
 	    ("vm_page_cowfault: object %p's paging-in-progress count is zero.",
 	    object)); 
@@ -2271,15 +2271,19 @@ vm_page_cowfault(vm_page_t m)
 		 * waiting to allocate a page.  If so, put things back 
 		 * the way they were 
 		 */
+		vm_page_lock(mnew);
 		vm_page_free(mnew);
+		vm_page_unlock(mnew);
 		vm_page_insert(m, object, pindex);
 	} else { /* clear COW & copy page */
 		if (!so_zerocp_fullpage)
 			pmap_copy_page(m, mnew);
+		vm_page_lock(mnew);
 		mnew->valid = VM_PAGE_BITS_ALL;
 		vm_page_dirty(mnew);
 		mnew->wire_count = m->wire_count - m->cow;
 		m->wire_count = m->cow;
+		vm_page_unlock(mnew);
 	}
 }