diff options
| author | kib <kib@FreeBSD.org> | 2015-05-27 08:30:16 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-05-27 08:30:16 +0000 |
| commit | 3162ff437e3400b7d8ed50f5e4cddf298e374c84 (patch) | |
| tree | 64502cdee8c845fdab52743679f4898e57180b9f /sys/vm | |
| parent | aed85e60ed6141ffee8b8ebc57f954582e51dd7b (diff) | |
| download | FreeBSD-src-3162ff437e3400b7d8ed50f5e4cddf298e374c84.zip FreeBSD-src-3162ff437e3400b7d8ed50f5e4cddf298e374c84.tar.gz | |
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.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_page.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ab3bd5e..8024a7c 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1639,6 +1639,7 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req) 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, boolean_t setvalid) 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) { |
