From owner-svn-src-user@FreeBSD.ORG  Mon Aug  5 12:55:23 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8C09EC31;
 Mon,  5 Aug 2013 12:55:23 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 79E142BFC;
 Mon,  5 Aug 2013 12:55:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r75CtN68082456;
 Mon, 5 Aug 2013 12:55:23 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r75CtN5v082454;
 Mon, 5 Aug 2013 12:55:23 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201308051255.r75CtN5v082454@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 5 Aug 2013 12:55:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253964 - user/attilio/vmobj-readlock/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 05 Aug 2013 12:55:23 -0000

Author: attilio
Date: Mon Aug  5 12:55:23 2013
New Revision: 253964
URL: http://svnweb.freebsd.org/changeset/base/253964

Log:
  Reduce diffs against head.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_fault.c

Modified: user/attilio/vmobj-readlock/sys/vm/vm_fault.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_fault.c	Mon Aug  5 12:52:37 2013	(r253963)
+++ user/attilio/vmobj-readlock/sys/vm/vm_fault.c	Mon Aug  5 12:55:23 2013	(r253964)
@@ -1367,13 +1367,12 @@ vm_fault_copy_entry(vm_map_t dst_map, vm
 			vm_page_lock(dst_m);
 			vm_page_wire(dst_m);
 			vm_page_unlock(dst_m);
-			vm_page_xunbusy(dst_m);
 		} else {
 			vm_page_lock(dst_m);
 			vm_page_activate(dst_m);
 			vm_page_unlock(dst_m);
-			vm_page_xunbusy(dst_m);
 		}
+		vm_page_xunbusy(dst_m);
 	}
 	VM_OBJECT_WUNLOCK(dst_object);
 	if (upgrade) {