svn commit: r207601 - head/sys/vm
Alan Cox
alc at FreeBSD.org
Tue May 4 05:55:19 UTC 2010
Author: alc
Date: Tue May 4 05:55:19 2010
New Revision: 207601
URL: http://svn.freebsd.org/changeset/base/207601
Log:
Add lock assertions.
Modified:
head/sys/vm/vm_page.c
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Tue May 4 05:47:17 2010 (r207600)
+++ head/sys/vm/vm_page.c Tue May 4 05:55:19 2010 (r207601)
@@ -1385,6 +1385,7 @@ vm_page_activate(vm_page_t m)
{
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ vm_page_lock_assert(m, MA_OWNED);
if (VM_PAGE_GETKNOWNQUEUE2(m) != PQ_ACTIVE) {
vm_pageq_remove(m);
if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) {
@@ -1588,8 +1589,10 @@ void
vm_page_unwire(vm_page_t m, int activate)
{
- if ((m->flags & PG_UNMANAGED) == 0)
+ if ((m->flags & PG_UNMANAGED) == 0) {
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ vm_page_lock_assert(m, MA_OWNED);
+ }
if (m->flags & PG_FICTITIOUS)
return;
if (m->wire_count > 0) {
@@ -1626,6 +1629,7 @@ _vm_page_deactivate(vm_page_t m, int ath
{
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ vm_page_lock_assert(m, MA_OWNED);
/*
* Ignore if already inactive.
@@ -1845,6 +1849,8 @@ vm_page_dontneed(vm_page_t m)
int head;
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ vm_page_lock_assert(m, MA_OWNED);
+ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
dnw = ++dnweight;
/*
More information about the svn-src-all
mailing list