- Push down Giant from vm_pageout() to vm_pageout_scan(), freeing

   vm_pageout_page_stats() from Giant.
 - Modify vm_pager_put_pages() and vm_pager_page_unswapped() to expect the
   vm object to be locked on entry.  (All of the pager routines now expect
   this.)

1 files changed, 4 insertions, 2 deletions

diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 390a769..d4f43e3 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -141,7 +141,8 @@ vm_pager_put_pages(
 	int flags,
 	int *rtvals
 ) {
-	GIANT_REQUIRED;
+
+	VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
 	(*pagertab[object->type]->pgo_putpages)
 	    (object, m, count, flags, rtvals);
 }
@@ -186,7 +187,8 @@ vm_pager_has_page(
 static __inline void
 vm_pager_page_unswapped(vm_page_t m)
 {
-	GIANT_REQUIRED;
+
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (pagertab[m->object->type]->pgo_pageunswapped)
 		(*pagertab[m->object->type]->pgo_pageunswapped)(m);
 }