svn commit: r269643 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Wed Aug  6 19:34:03 2014
New Revision: 269643
URL: http://svnweb.freebsd.org/changeset/base/269643

Log:
  The vm_pager_page_unswapped() pager op is only implemented for the
  swap pager.  Swap pager uses a private mutex to protect swap metadata,
  and does not rely on the vm object lock to ensure integrity of it.
  
  Weaken the requirement for the vm object lock by only asserting locked
  object in vm_pager_page_unswapped(), instead of locked exclusively.
  
  Reviewed by:	alc
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/vm/vm_pager.h

Modified: head/sys/vm/vm_pager.h
==============================================================================
--- head/sys/vm/vm_pager.h	Wed Aug  6 19:30:35 2014	(r269642)
+++ head/sys/vm/vm_pager.h	Wed Aug  6 19:34:03 2014	(r269643)
@@ -187,7 +187,7 @@ static __inline void
 vm_pager_page_unswapped(vm_page_t m)
 {
 
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
+	VM_OBJECT_ASSERT_LOCKED(m->object);
 	if (pagertab[m->object->type]->pgo_pageunswapped)
 		(*pagertab[m->object->type]->pgo_pageunswapped)(m);
 }