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

Timestamp:

Aug 14, 2017, 11:39:03 AM (7 years ago)

Author:

alain

Message:

Change Time unit from cycle to TICK (in millisecond).
Fix several bugs in VFS.

File:

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

trunk/kernel/vfs/vfs.c

@@ -1103 +1103 @@
     inode_type = hal_remote_lw( XPTR( inode_cxy , &inode_ptr->type ) );
 
+    // get local pointer on associated mapper
+    mapper_t * mapper_ptr = hal_remote_lpt( XPTR( inode_cxy , &inode_ptr->mapper ) );
+
     // make a local copy of node name
     hal_remote_strcpy( XPTR( local_cxy , name ) , name_xp );
 
     // display inode
-    nolock_printk("%s%s <%s> inode_xp = %l / dentry_xp = %l\n",
-                  indent_str[indent], vfs_inode_type_str( inode_type ), 
-                  name , inode_xp , dentry_xp );
+    nolock_printk("%s%s <%s> : inode = %l / mapper = %l / dentry = %l\n",
+                  indent_str[indent], vfs_inode_type_str( inode_type ), name,
+                  inode_xp , XPTR( inode_cxy , mapper_ptr ) , dentry_xp );
 
     // scan directory entries  
@@ -1165 +1168 @@
 
     // get extended pointer on associated dentry
-    dentry_xp = hal_remote_lwd( XPTR( inode_cxy , &inode_ptr->parent_xp ) );
+    dentry_xp   = hal_remote_lwd( XPTR( inode_cxy , &inode_ptr->parent_xp ) );
 
     // check if target inode is the File System root
@@ -1604 +1607 @@
     parent_ptr = (vfs_inode_t *)GET_PTR( parent_xp );
 
-    vfs_dmsg("\n[INFO] %s : enter in cluster %x for %s / child_cxy = %x / parent_xp = %l\n",
+    vfs_dmsg("\n[INFO] %s : enter in cluster %x for <%s> / child_cxy = %x / parent_xp = %l\n",
     __FUNCTION__ , local_cxy , name , child_cxy , parent_xp );
 
@@ -1615 +1618 @@
                                    &dentry_xp );
 
-        vfs_dmsg("\n[INFO] %s : dentry created in local cluster %x\n",
-                 __FUNCTION__ , local_cxy );
+        vfs_dmsg("\n[INFO] %s : dentry <%s> created in local cluster %x\n",
+                 __FUNCTION__ , name , local_cxy );
     }
     else                               // parent cluster is remote
@@ -1627 +1630 @@
                                       &error );
 
-        vfs_dmsg("\n[INFO] %s : dentry created in remote cluster %x\n",
-                 __FUNCTION__ , parent_cxy );
+        vfs_dmsg("\n[INFO] %s : dentry <%s> created in remote cluster %x\n",
+                 __FUNCTION__ , name , parent_cxy );
     }
                                       
@@ -1656 +1659 @@
                                   &inode_xp );
 
-        vfs_dmsg("\n[INFO] %s : inode created in local cluster %x\n",
-                 __FUNCTION__ , local_cxy );
+        vfs_dmsg("\n[INFO] %s : inode %l created in local cluster %x\n",
+                 __FUNCTION__ , inode_xp , local_cxy );
     }
     else                              // child cluster is remote
@@ -1673 +1676 @@
                                      &error );
 
-        vfs_dmsg("\n[INFO] %s : inodecreated in remote cluster %x\n",
-                 __FUNCTION__ , child_cxy );
+        vfs_dmsg("\n[INFO] %s : inode %l created in remote cluster %x\n",
+                 __FUNCTION__ , inode_xp , child_cxy );
     }
                                      
@@ -1693 +1696 @@
     hal_remote_swd( XPTR( dentry_cxy , &dentry_ptr->child_xp ) , inode_xp );
 
-    vfs_dmsg("\n[INFO] %s : exit in cluster %x for %s\n",
+    vfs_dmsg("\n[INFO] %s : exit in cluster %x for <%s>\n",
     __FUNCTION__ , local_cxy , name );
 
@@ -1716 +1719 @@
     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 );
+    vfs_dmsg("\n[INFO] %s : enters for page %d in mapper / inode %l\n",
+    __FUNCTION__ , page->index , XPTR( local_cxy , &mapper->inode ) );
 
     // get FS type
@@ -1745 +1747 @@
     }
 
-    vfs_dmsg("\n[INFO] %s : exit for page = %d in mapper = %x\n",
-             __FUNCTION__ , page->index , mapper );
+    vfs_dmsg("\n[INFO] %s : exit for page %d in mapper / inode %l\n",
+    __FUNCTION__ , page->index , XPTR( local_cxy , &mapper->inode) );
 
     return error;