From owner-svn-src-user@FreeBSD.ORG  Sun Feb 22 17:57:36 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 364601065670;
	Sun, 22 Feb 2009 17:57:36 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 256638FC13;
	Sun, 22 Feb 2009 17:57:36 +0000 (UTC) (envelope-from alc@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 n1MHvaIb002484;
	Sun, 22 Feb 2009 17:57:36 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1MHvaoV002483;
	Sun, 22 Feb 2009 17:57:36 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902221757.n1MHvaoV002483@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 22 Feb 2009 17:57:36 +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: r188920 - user/alc/pagelock/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: Sun, 22 Feb 2009 17:57:36 -0000

Author: alc
Date: Sun Feb 22 17:57:35 2009
New Revision: 188920
URL: http://svn.freebsd.org/changeset/base/188920

Log:
  Maintain the lock on the object containing the page being mapped.

Modified:
  user/alc/pagelock/sys/vm/vm_fault.c

Modified: user/alc/pagelock/sys/vm/vm_fault.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_fault.c	Sun Feb 22 15:03:29 2009	(r188919)
+++ user/alc/pagelock/sys/vm/vm_fault.c	Sun Feb 22 17:57:35 2009	(r188920)
@@ -1210,7 +1210,6 @@ vm_fault_copy_entry(dst_map, src_map, ds
 		pmap_copy_page(src_m, dst_m);
 		VM_OBJECT_UNLOCK(object);
 		dst_m->valid = VM_PAGE_BITS_ALL;
-		VM_OBJECT_UNLOCK(dst_object);
 
 		/*
 		 * Enter it in the pmap as a read and/or execute access.
@@ -1221,7 +1220,6 @@ vm_fault_copy_entry(dst_map, src_map, ds
 		/*
 		 * Mark it no longer busy, and put it on the active list.
 		 */
-		VM_OBJECT_LOCK(dst_object);
 		vm_page_lock_queues();
 		vm_page_activate(dst_m);
 		vm_page_unlock_queues();