diff options
| author | kib <kib@FreeBSD.org> | 2015-10-15 19:07:38 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-10-15 19:07:38 +0000 |
| commit | 3b70fdfb1d5aad9b451d851ad230e613004570f9 (patch) | |
| tree | 5dd9f1a38d74f95727c6f8a5bdc5ce5e52c9aa5d /sys/vm | |
| parent | 86f2836d37468318da95f77eb25bda9c577e29e1 (diff) | |
| download | FreeBSD-src-3b70fdfb1d5aad9b451d851ad230e613004570f9.zip FreeBSD-src-3b70fdfb1d5aad9b451d851ad230e613004570f9.tar.gz | |
Revert r289302, invalid pages can be queued, e.g. by vfs_vmio_unwire().
Found by: alc
Tested by: pho
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_pageout.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 5611ae6..e0d00f5 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -1174,12 +1174,11 @@ unlock_page: queues_locked = FALSE; /* - * Invalid pages cannot appear on a queue. If - * vm_pageout_fallback_object_lock() allowed a window - * where the page could be invalidated, it should - * detect this. + * Invalid pages can be easily freed. They cannot be + * mapped, vm_page_free() asserts this. */ - KASSERT(m->valid != 0, ("Invalid page %p on inact queue", m)); + if (m->valid == 0) + goto free_page; /* * If the page has been referenced and the object is not dead, @@ -1232,6 +1231,7 @@ unlock_page: /* * Clean pages can be freed. */ +free_page: vm_page_free(m); PCPU_INC(cnt.v_dfree); --page_shortage; |
