From owner-svn-src-user@FreeBSD.ORG  Tue Apr 20 04:37:07 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 ADC981065672;
	Tue, 20 Apr 2010 04:37:07 +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 9DAF88FC12;
	Tue, 20 Apr 2010 04:37:07 +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 o3K4b7w4015965;
	Tue, 20 Apr 2010 04:37:07 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3K4b7EW015964;
	Tue, 20 Apr 2010 04:37:07 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004200437.o3K4b7EW015964@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 20 Apr 2010 04:37:07 +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: r206886 - 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: Tue, 20 Apr 2010 04:37:07 -0000

Author: kmacy
Date: Tue Apr 20 04:37:07 2010
New Revision: 206886
URL: http://svn.freebsd.org/changeset/base/206886

Log:
  The busy flag is protected by the object lock, don't need to hold page lock across it
  
  Pointed out by: alc@

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

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_object.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_object.c	Tue Apr 20 04:16:39 2010	(r206885)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_object.c	Tue Apr 20 04:37:07 2010	(r206886)
@@ -1445,9 +1445,9 @@ retry:
 		}
 		vm_page_lock(m);
 		vm_page_rename(m, new_object, idx);
+		vm_page_unlock(m);
 		/* page automatically made dirty by rename and cache handled */
 		vm_page_busy(m);
-		vm_page_unlock(m);
 	}
 	if (orig_object->type == OBJT_SWAP) {
 		/*