From owner-svn-src-user@FreeBSD.ORG  Sat Jun 22 13:11:27 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])
 by hub.freebsd.org (Postfix) with ESMTP id E0127DDA;
 Sat, 22 Jun 2013 13:11:27 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D27C61D77;
 Sat, 22 Jun 2013 13:11:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MDBRAn034365;
 Sat, 22 Jun 2013 13:11:27 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5MDBRGX034364;
 Sat, 22 Jun 2013 13:11:27 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201306221311.r5MDBRGX034364@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Jun 2013 13:11:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r252096 - 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: Sat, 22 Jun 2013 13:11:27 -0000

Author: attilio
Date: Sat Jun 22 13:11:27 2013
New Revision: 252096
URL: http://svnweb.freebsd.org/changeset/base/252096

Log:
  Complete further r252046.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/swap_pager.c	Sat Jun 22 12:50:05 2013	(r252095)
+++ user/attilio/vmobj-readlock/sys/vm/swap_pager.c	Sat Jun 22 13:11:27 2013	(r252096)
@@ -1708,8 +1708,7 @@ swp_pager_force_pagein(vm_object_t objec
 	vm_page_t m;
 
 	vm_object_pip_add(object, 1);
-	m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | VM_ALLOC_RETRY |
-	    VM_ALLOC_NOBUSY);
+	m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 	if (m->valid == VM_PAGE_BITS_ALL) {
 		vm_object_pip_subtract(object, 1);
 		vm_page_dirty(m);
@@ -1721,7 +1720,6 @@ swp_pager_force_pagein(vm_object_t objec
 		return;
 	}
 
-	vm_page_busy(m);
 	if (swap_pager_getpages(object, &m, 1, 0) != VM_PAGER_OK)
 		panic("swap_pager_force_pagein: read from swap failed");/*XXX*/
 	vm_object_pip_subtract(object, 1);