From owner-svn-src-head@FreeBSD.ORG  Fri Apr 30 16:20:14 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6FF961065672;
	Fri, 30 Apr 2010 16:20:14 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 607E88FC14;
	Fri, 30 Apr 2010 16:20:14 +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 o3UGKEbh016673;
	Fri, 30 Apr 2010 16:20:14 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3UGKE1n016671;
	Fri, 30 Apr 2010 16:20:14 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201004301620.o3UGKE1n016671@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 30 Apr 2010 16:20:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207438 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2010 16:20:14 -0000

Author: kib
Date: Fri Apr 30 16:20:14 2010
New Revision: 207438
URL: http://svn.freebsd.org/changeset/base/207438

Log:
  Unlock page lock instead of recursively locking it.

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Fri Apr 30 15:22:52 2010	(r207437)
+++ head/sys/vm/vm_fault.c	Fri Apr 30 16:20:14 2010	(r207438)
@@ -1284,19 +1284,19 @@ vm_fault_copy_entry(vm_map_t dst_map, vm
 			vm_page_lock_queues();
 			vm_page_unwire(src_m, 0);
 			vm_page_unlock_queues();
-			vm_page_lock(src_m);
+			vm_page_unlock(src_m);
 
 			vm_page_lock(dst_m);
 			vm_page_lock_queues();
 			vm_page_wire(dst_m);
 			vm_page_unlock_queues();
-			vm_page_lock(dst_m);
+			vm_page_unlock(dst_m);
 		} else {
 			vm_page_lock(dst_m);
 			vm_page_lock_queues();
 			vm_page_activate(dst_m);
 			vm_page_unlock_queues();
-			vm_page_lock(dst_m);
+			vm_page_unlock(dst_m);
 		}
 		vm_page_wakeup(dst_m);
 	}