svn commit: r252097 - user/attilio/vmobj-readlock/sys/vm

[Attilio Rao]

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);