svn commit: r283598 - stable/10/sys/vm
Konstantin Belousov
kib at FreeBSD.org
Wed May 27 08:30:17 UTC 2015
Author: kib
Date: Wed May 27 08:30:16 2015
New Revision: 283598
URL: https://svnweb.freebsd.org/changeset/base/283598
Log:
MFC r283162:
Set VPO_UNMANAGED on the freed page when insertion of the page into the
object queue failed, to satisfy the assertion.
MFC r283163:
Do grammar fix in the comment to record the right commit message for
r283162.
Modified:
stable/10/sys/vm/vm_page.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/vm/vm_page.c
==============================================================================
--- stable/10/sys/vm/vm_page.c Wed May 27 08:23:23 2015 (r283597)
+++ stable/10/sys/vm/vm_page.c Wed May 27 08:30:16 2015 (r283598)
@@ -1639,6 +1639,7 @@ vm_page_alloc(vm_object_t object, vm_pin
m->wire_count = 0;
}
m->object = NULL;
+ m->oflags = VPO_UNMANAGED;
vm_page_free(m);
return (NULL);
}
@@ -3037,8 +3038,8 @@ vm_page_zero_invalid(vm_page_t m, boolea
VM_OBJECT_ASSERT_WLOCKED(m->object);
/*
* Scan the valid bits looking for invalid sections that
- * must be zerod. Invalid sub-DEV_BSIZE'd areas ( where the
- * valid bit may be set ) have already been zerod by
+ * must be zeroed. Invalid sub-DEV_BSIZE'd areas ( where the
+ * valid bit may be set ) have already been zeroed by
* vm_page_set_validclean().
*/
for (b = i = 0; i <= PAGE_SIZE / DEV_BSIZE; ++i) {
More information about the svn-src-all
mailing list