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

Timestamp:

Jul 21, 2017, 7:36:08 AM (7 years ago)

Author:

alain

Message:

Fix several bugs in VFS.

File:

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

trunk/kernel/vfs/vfs.c

@@ -640 +640 @@
     if( error ) return error;
 
-    vfs_dmsg("\n[INFO] %s exit for %s / file_id = %d / file_xp = %l / at cycle %d\n",
+    vfs_dmsg("\n[INFO] %s : exit for <%s> / file_id = %d / file_xp = %l / at cycle %d\n",
              __FUNCTION__ , path , file_id , file_xp , hal_get_cycles() );
 
@@ -652 +652 @@
 /////////////////////////////////////
 error_t vfs_move( bool_t   to_buffer,
+                  bool_t   is_user,
                   xptr_t   file_xp,
                   void   * buffer,
@@ -682 +683 @@
         if( file_cxy == local_cxy )
         {
-            error = mapper_move( mapper,
-                                 to_buffer,
-                                 file_offset,
-                                 buffer,
-                                 size );
+            error = mapper_move_buffer( mapper,
+                                        to_buffer,
+                                        is_user,
+                                        file_offset,
+                                        buffer,
+                                        size );
         }
         else
         {
-            rpc_mapper_move_client( file_cxy,
-                                    mapper,
-                                    to_buffer,
-                                    file_offset,
-                                    buffer,
-                                    size,
-                                    &error );
+            rpc_mapper_move_buffer_client( file_cxy,
+                                           mapper,
+                                           to_buffer,
+                                           is_user,
+                                           file_offset,
+                                           buffer,
+                                           size,
+                                           &error );
         } 
 
-        return error;
-    }
-    else if (inode_type == INODE_TYPE_DIR )
-    {
-        printk("\n[ERROR] in %s : inode is a directory", __FUNCTION__ );
-        return EINVAL;
-    }
-    else if (inode_type == INODE_TYPE_DEV )
-    {
-        // TODO  [AG]
-        return 0;
-    }
-    else
-    {
-        printk("\n[PANIC] in %s : illegal inode type\n", __FUNCTION__ );
-        hal_core_sleep();
+        if( error ) return -1;
+        else        return size;
+    }
+    else 
+    {
+        printk("\n[ERROR] in %s : inode is not a file", __FUNCTION__ );
         return -1;
     }
@@ -1377 +1370 @@
     vfs_inode_unlock( parent_xp );
 
-    vfs_dmsg("\n[INFO] in %s : exit / %s found / inode = %l\n",
+    vfs_dmsg("\n[INFO] in %s : exit <%s> found / inode = %l\n",
                  __FUNCTION__ , pathname , child_xp );
 
@@ -1609 +1602 @@
 error_t vfs_mapper_load_all( vfs_inode_t * inode )
 {
-    assert( (inode != NULL) , __FUNCTION__ , "page pointer is NULL\n" );
+    assert( (inode != NULL) , __FUNCTION__ , "inode pointer is NULL\n" );
 
     uint32_t   index;
@@ -1617 +1610 @@
     uint32_t   size   = inode->size;
 
-    assert( (mapper != NULL) , __FUNCTION__ , "no mapper for page\n" );
-
-    assert( (size != 0) , __FUNCTION__ , "size cannot be 0\n");
+    assert( (mapper != NULL) , __FUNCTION__ , "mapper pointer is NULL\n" );
 
     uint32_t npages = size >> CONFIG_PPM_PAGE_SHIFT;
-    if( size & CONFIG_PPM_PAGE_MASK ) npages++;
-
-    // loop on all pages 
+    if( (size & CONFIG_PPM_PAGE_MASK) || (size == 0) ) npages++;
+
+    // loop on pages 
     for( index = 0 ; index < npages ; index ++ )
     {