From owner-svn-src-user@FreeBSD.ORG  Sat Jun 22 16:10:58 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 0D751E57;
 Sat, 22 Jun 2013 16:10:58 +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 F417112CB;
 Sat, 22 Jun 2013 16:10:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MGAvhv089244;
 Sat, 22 Jun 2013 16:10:57 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5MGAvVG089243;
 Sat, 22 Jun 2013 16:10:57 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201306221610.r5MGAvVG089243@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 22 Jun 2013 16:10:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r252097 - 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 16:10:58 -0000

Author: attilio
Date: Sat Jun 22 16:10:57 2013
New Revision: 252097
URL: http://svnweb.freebsd.org/changeset/base/252097

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

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

Modified: user/attilio/vmobj-readlock/sys/vm/vm_glue.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_glue.c	Sat Jun 22 13:11:27 2013	(r252096)
+++ user/attilio/vmobj-readlock/sys/vm/vm_glue.c	Sat Jun 22 16:10:57 2013	(r252097)
@@ -241,10 +241,8 @@ vm_imgact_page_iostart(vm_object_t objec
 
 	VM_OBJECT_WLOCK(object);
 	pindex = OFF_TO_IDX(offset);
-	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_page_busy(m);
 		ma[0] = m;
 		rv = vm_pager_get_pages(object, ma, 1, 0);
 		m = vm_page_lookup(object, pindex);
@@ -257,8 +255,8 @@ vm_imgact_page_iostart(vm_object_t objec
 			m = NULL;
 			goto out;
 		}
-		vm_page_wakeup(m);
 	}
+	vm_page_wakeup(m);
 	vm_page_io_start(m);
 out:
 	VM_OBJECT_WUNLOCK(object);