Commit d976419c authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 26c00f39
......@@ -881,8 +881,8 @@ VMFaultResult vma_on_pagefault(VMA *vma, uintptr_t addr, int write)
// XXX overlay: assert !vma->page_ismappedv[blk] XXX not ok? (retrying after virt unlock/lock)
vma_mmap_page(vma, page);
/* wcfs: mmap the page to all wcfs-backed vmas. If we don't, the memory on
* those vmas will read with stale data */
/* wcfs: also mmap the page to all wcfs-backed vmas. If we don't, the
* memory on those vmas will read with stale data */
if (fileh->mmap_overlay) {
list_for_each(hmmap, &fileh->mmaps) {
VMA *vma2 = list_entry(hmmap, typeof(*vma2), same_fileh);
......@@ -930,6 +930,7 @@ static int __ram_reclaim(RAM *ram)
/* can release ram only from loaded non-dirty pages
* NOTE PAGE_LOADING pages are not dropped - they just continue to load */
// XXX PAGE_LOADED_FOR_WRITE vvv ok?
if (page->state == PAGE_LOADED || page->state == PAGE_LOADED_FOR_WRITE) {
page_drop_memory(page);
batch--;
......@@ -1051,7 +1052,7 @@ static void page_del(Page *page) {
static void *vma_page_addr(VMA *vma, Page *page)
{
uintptr_t addr;
ASSERT(vma->fileh == page->fileh); // XXX needed here?
ASSERT(vma->fileh == page->fileh);
addr = vma->addr_start + (page->f_pgoffset - vma->f_pgoffset) * page_size(page);
ASSERT(vma->addr_start <= addr &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment