svn commit: r311513 - stable/11/sys/vm
Konstantin Belousov
kib at FreeBSD.org
Fri Jan 6 11:46:25 UTC 2017
Author: kib
Date: Fri Jan 6 11:46:24 2017
New Revision: 311513
URL: https://svnweb.freebsd.org/changeset/base/311513
Log:
MFC r310834:
Assert that the pages found on the object queue by vm_page_next() and
vm_page_prev() have correct ownership.
Modified:
stable/11/sys/vm/vm_page.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/vm/vm_page.c
==============================================================================
--- stable/11/sys/vm/vm_page.c Fri Jan 6 10:18:34 2017 (r311512)
+++ stable/11/sys/vm/vm_page.c Fri Jan 6 11:46:24 2017 (r311513)
@@ -1327,9 +1327,11 @@ vm_page_next(vm_page_t m)
vm_page_t next;
VM_OBJECT_ASSERT_LOCKED(m->object);
- if ((next = TAILQ_NEXT(m, listq)) != NULL &&
- next->pindex != m->pindex + 1)
- next = NULL;
+ if ((next = TAILQ_NEXT(m, listq)) != NULL) {
+ MPASS(next->object == m->object);
+ if (next->pindex != m->pindex + 1)
+ next = NULL;
+ }
return (next);
}
@@ -1345,9 +1347,11 @@ vm_page_prev(vm_page_t m)
vm_page_t prev;
VM_OBJECT_ASSERT_LOCKED(m->object);
- if ((prev = TAILQ_PREV(m, pglist, listq)) != NULL &&
- prev->pindex != m->pindex - 1)
- prev = NULL;
+ if ((prev = TAILQ_PREV(m, pglist, listq)) != NULL) {
+ MPASS(prev->object == m->object);
+ if (prev->pindex != m->pindex - 1)
+ prev = NULL;
+ }
return (prev);
}
More information about the svn-src-all
mailing list