X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/8b8f49b713d64065775fe538232f8639083601bd..7cdb9e293b5657fac5295025a47c5b215ea62c0b:/lunaix-os/kernel/fs/pcache.c diff --git a/lunaix-os/kernel/fs/pcache.c b/lunaix-os/kernel/fs/pcache.c index 8283fd1..4c6f69c 100644 --- a/lunaix-os/kernel/fs/pcache.c +++ b/lunaix-os/kernel/fs/pcache.c @@ -23,21 +23,21 @@ static void pcache_free_page(void* va) { ptr_t pa = vmm_del_mapping(VMS_SELF, (ptr_t)va); - pmm_free_page(KERNEL_PID, pa); + pmm_free_page(pa); } static void* pcache_alloc_page() { int i = 0; - ptr_t pp = pmm_alloc_page(KERNEL_PID, 0), va = 0; + ptr_t pp = pmm_alloc_page(0), va = 0; if (!pp) { return NULL; } if (!(va = (ptr_t)vmap(pp, PG_SIZE, PG_PREM_RW, 0))) { - pmm_free_page(KERNEL_PID, pp); + pmm_free_page(pp); return NULL; } @@ -140,8 +140,7 @@ pcache_write(struct v_inode* inode, void* data, u32_t len, u32_t fpos) if (new_page) { // Filling up the page - errno = - inode->default_fops->read_page(inode, pg->pg, PG_SIZE, pg->fpos); + errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos); if (errno < 0) { break; @@ -178,8 +177,7 @@ pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos) int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg); if (new_page) { // Filling up the page - errno = - inode->default_fops->read_page(inode, pg->pg, PG_SIZE, pg->fpos); + errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos); if (errno < 0) { break; @@ -191,7 +189,7 @@ pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos) pg->len = errno; } else if (!pg) { - errno = inode->default_fops->read_page( + errno = inode->default_fops->read( inode, (data + buf_off), len - buf_off, pg->fpos); buf_off = len; break; @@ -231,8 +229,7 @@ pcache_commit(struct v_inode* inode, struct pcache_pg* page) return 0; } - int errno = - inode->default_fops->write_page(inode, page->pg, PG_SIZE, page->fpos); + int errno = inode->default_fops->write_page(inode, page->pg, page->fpos); if (!errno) { page->flags &= ~PCACHE_DIRTY;