Module Name: src
Committed By: chs
Date: Wed Dec 9 00:03:32 UTC 2020
Modified Files:
src/sys/rump/librump/rumpvfs: vm_vfs.c
Log Message:
make rump's uvm_aio_aiodone_pages() look more like the kernel version.
fixes some more rumpy assertions.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpvfs/vm_vfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.40 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.41
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.40 Thu Oct 22 03:05:17 2020
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c Wed Dec 9 00:03:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_vfs.c,v 1.40 2020/10/22 03:05:17 chs Exp $ */
+/* $NetBSD: vm_vfs.c,v 1.41 2020/12/09 00:03:32 chs Exp $ */
/*
* Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.40 2020/10/22 03:05:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.41 2020/12/09 00:03:32 chs Exp $");
#include <sys/param.h>
@@ -48,6 +48,16 @@ uvm_aio_aiodone_pages(struct vm_page **p
pg = pgs[i];
KASSERT((pg->flags & PG_PAGEOUT) == 0 ||
(pg->flags & PG_FAKE) == 0);
+
+ if (pg->flags & PG_FAKE) {
+ KASSERT(!write);
+ pg->flags &= ~PG_FAKE;
+ KASSERT(uvm_pagegetdirty(pg) == UVM_PAGE_STATUS_CLEAN);
+ uvm_pagelock(pg);
+ uvm_pageenqueue(pg);
+ uvm_pageunlock(pg);
+ }
+
}
uvm_page_unbusy(pgs, npages);
rw_exit(uobj->vmobjlock);
