Unifying the Lunaix's Physical Memory Model (#28)

[lunaix-os.git] / lunaix-os / kernel / fs / pcache.c

diff --git a/lunaix-os/kernel/fs/pcache.c b/lunaix-os/kernel/fs/pcache.c
index 3e77cf50a56cb756596032ca569e0187beff4e0b..26e7ac4882035b0362eaa148931e79e1a816d3d5 100644 (file)
--- a/lunaix-os/kernel/fs/pcache.c
+++ b/lunaix-os/kernel/fs/pcache.c
@@ -1,9 +1,8 @@
 #include <klibc/string.h>
 #include <lunaix/ds/btrie.h>
 #include <lunaix/fs.h>
 #include <klibc/string.h>
 #include <lunaix/ds/btrie.h>
 #include <lunaix/fs.h>

-#include <lunaix/mm/pmm.h>
+#include <lunaix/mm/page.h>

 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/valloc.h>

-#include <lunaix/mm/vmm.h>

 #include <lunaix/spike.h>
 
 #define PCACHE_DIRTY 0x1
 #include <lunaix/spike.h>
 
 #define PCACHE_DIRTY 0x1


@@ -21,22 +20,24 @@ __pcache_try_evict(struct lru_node* obj)
 static void
 pcache_free_page(void* va)
 {
 static void
 pcache_free_page(void* va)
 {

-    ptr_t pa = vmm_del_mapping(VMS_SELF, (ptr_t)va);
-    pmm_free_page(pa);
+    pte_t* ptep = mkptep_va(VMS_SELF, (ptr_t)va);
+    pte_t pte = pte_at(ptep);
+    leaflet_return(pte_leaflet(pte));

 }
 
 static void*
 pcache_alloc_page()
 {
     int i = 0;
 }
 
 static void*
 pcache_alloc_page()
 {
     int i = 0;

-    ptr_t pp = pmm_alloc_page(0), va = 0;
+    ptr_t va = 0;
+    struct leaflet* leaflet = alloc_leaflet(0);

 
 

-    if (!pp) {
+    if (!leaflet) {

         return NULL;
     }
 
         return NULL;
     }
 

-    if (!(va = (ptr_t)vmap(pp, PAGE_SIZE, KERNEL_DATA))) {
-        pmm_free_page(pp);
+    if (!(va = (ptr_t)vmap(leaflet, KERNEL_DATA))) {
+        leaflet_return(leaflet);

         return NULL;
     }
 
         return NULL;
     }