Changeset 246 for trunk/kernel/vfs/vfs.c

Timestamp:

Jul 20, 2017, 12:55:23 PM (7 years ago)

Author:

alain

Message:

Fix a major bug in FATFS : miss handling in the FAT mapper.

File:

• trunk/kernel/vfs/vfs.c (modified) (9 diffs)

trunk/kernel/vfs/vfs.c

@@ -161 +161 @@
     {
         ctx = NULL;
-        printk("\n[PANIC] in %s : undefined file system type\n", __FUNCTION__ );
+                printk("\n[PANIC] in %s : illegal file system type = %d\n", __FUNCTION__ , fs_type );
         hal_core_sleep();
     }
@@ -175 +175 @@
 
     // allocate memory for mapper
-    mapper = mapper_create();
+    mapper = mapper_create( fs_type );
 
     if( mapper == NULL )
@@ -209 +209 @@
     inode->parent_xp  = dentry_xp;
     inode->ctx        = ctx;
-    inode->mapper     = NULL;  
+    inode->mapper     = mapper;
     inode->extend     = extend;
 
+    // initialise inode field in mapper
+    mapper->inode     = inode;
+ 
     // initialise threads waiting queue
     xlist_root_init( XPTR( local_cxy , &inode->wait_root ) );
@@ -253 +256 @@
                         xptr_t        child_xp )
 {
+    vfs_dmsg("\n[INFO] %s : enter for child <%s>\n",
+             __FUNCTION__ , name );
+
     error_t error = 0;
 
@@ -279 +285 @@
         assert( false , __FUNCTION__ , "undefined file system type\n" );
     }
+
+    vfs_dmsg("\n[INFO] %s : exit for child <%s>\n",
+             __FUNCTION__ , name );
 
     return error;
@@ -1253 +1262 @@
         // for the last name, the behaviour depends on the "mode" argument:
 
-        if (found == false ) // directory node not found in inode tree 
+        if (found == false ) // child node not found in inode tree 
         {
             vfs_dmsg("\n[INFO] %s : <%s> not found, try to load it\n",
@@ -1559 +1568 @@
     assert( (page != NULL) , __FUNCTION__ , "page pointer is NULL\n" );
 
-    mapper_t * mapper = page->mapper;
+    mapper_t    * mapper = page->mapper;
+
 
     assert( (mapper != NULL) , __FUNCTION__ , "no mapper for page\n" );
 
+    vfs_dmsg("\n[INFO] %s : enters for page = %d in mapper = %x\n",
+             __FUNCTION__ , page->index , mapper );
+
     // get FS type
-    vfs_fs_type_t fs_type = mapper->inode->ctx->type;
+    vfs_fs_type_t fs_type = mapper->type;
 
     // call relevant FS function
@@ -1570 +1583 @@
     {
         rwlock_wr_lock( &mapper->lock );
-        error = fatfs_move_page( page , to_mapper ); 
+        error = fatfs_mapper_move_page( page , to_mapper ); 
         rwlock_wr_unlock( &mapper->lock );
     }
@@ -1585 +1598 @@
         assert( false , __FUNCTION__ , "undefined file system type\n" );
     }
+
+    vfs_dmsg("\n[INFO] %s : exit for page = %d in mapper = %x\n",
+             __FUNCTION__ , page->index , mapper );
 
     return error;