Changeset 238 for trunk/kernel/mm

Timestamp:

Jul 19, 2017, 3:31:39 PM (7 years ago)

Author:

alain

Message:

Fixing bugs in vfs_lookup()

Location:

trunk/kernel/mm

Files:

• mapper.c (modified) (4 diffs)
• mapper.h (modified) (1 diff)
• page.c (modified) (1 diff)

trunk/kernel/mm/mapper.c

@@ -164 +164 @@
         page = grdxt_lookup( &mapper->radix , index );
 
-        if ( page == NULL )   // missing page => load it from file system
+        if ( page == NULL )   // missing page => create it and load it from file system
         {
             mapper_dmsg("\n[INFO] %s : missing page => load from FS\n", __FUNCTION__ );
@@ -208 +208 @@
             }
 
+            // update the mapper and index fields in page descriptor
+            // required by the vfs_move_page_to_mapper() 
+            page->mapper = mapper;
+            page->index  = index;
+
             // launch I/O operation to load page from file system
-            error = vfs_move_page_to_mapper( page );
+            error = vfs_mapper_move_page( page , true );   // to mapper
 
             if( error )
@@ -223 +228 @@
             }
 
-            // update the mapper and index fields in page descriptor
-            page->mapper = mapper;
-            page->index  = index;
-
             // reset the page INLOAD flag to make the page available to all readers
             page_clear_flag( page , PG_INLOAD );
@@ -267 +268 @@
 
     // lauch IO operation to update page to file system
-    error = vfs_move_page_from_mapper( page );
+    error = vfs_mapper_move_page( page , false );    // from mapper
 
     if( error )

trunk/kernel/mm/mapper.h

@@ -49 +49 @@
  * - The mapper is protected by a blocking "rwlock", to support several simultaneous
  *   readers, and only one writer. This lock implement a busy waiting policy.
- * - The two functions vfs_move_page_to_mapper() and vfs_move_page_from_mapper() define 
- *   the generic API used to move pages to or from the relevant file system.
- * - the mapper_move() function is used to move data to or from a, possibly distributed
- *   user buffer in user space. 
+ * - The vfs_mapper_move_page() and vfs_mapper_load_all() functions are used to move
+ *   pages to or from the file system on device.
+ * - the mapper_move() function is used to move data to or from an user buffer.
+ *   This user space buffer can be physically distributed in several clusters.
  * - The mapper_get_page() function that return a page descriptor pointer from a page
  *   index in file is in charge of handling the miss on the mapper cache.

trunk/kernel/mm/page.c

@@ -147 +147 @@
 
                 // sync the page
-                vfs_move_page_from_mapper( page );
+                vfs_mapper_move_page( page , false );  // from mapper
 
                 // unlock the page