Changeset 610 for trunk/kernel/fs/fatfs.c

Timestamp:

Dec 27, 2018, 7:38:58 PM (4 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

• trunk/kernel/fs/fatfs.c (modified) (5 diffs)

trunk/kernel/fs/fatfs.c

@@ -1246 +1246 @@
 vfs_inode_get_name( XPTR( local_cxy , inode ) , dir_name );
 if( DEBUG_FATFS_REMOVE_DENTRY < cycle )
-printk("\n[%s]  thread[%x,%x] enter / parent <%s> / child <%s> / cycle %d\n",
+printk("\n[%s] thread[%x,%x] enter / parent <%s> / child <%s> / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, dir_name, dentry->name, cycle );
 #endif
@@ -1280 +1280 @@
     uint32_t  page_id    = dentry_id >> 7;
     uint32_t  offset     = (dentry_id & 0x7F)<<5;
+
+#if DEBUG_FATFS_REMOVE_DENTRY & 1
+if( DEBUG_FATFS_REMOVE_DENTRY < cycle )
+printk("\n[%s] dentry_id %x / page_id %x / offset %x\n",
+__FUNCTION__, dentry_id, page_id, offset );
+#endif
 
     // get extended pointer on page descriptor from parent directory mapper
@@ -1345 +1351 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_FATFS_REMOVE_DENTRY < cycle )
-printk("\n[%s]  thread[%x,%x] exit / parent %s / child %s / cycle %d\n",
+printk("\n[%s] thread[%x,%x] exit / parent %s / child %s / cycle %d\n",
 __FUNCTION__, this->process->pid, this->trdid, dir_name, dentry->name, cycle );
 #endif
@@ -1358 +1364 @@
                           xptr_t        child_inode_xp )
 {
-    // Two embedded loops:
+    // Two embedded loops to scan the directory mapper:
     // - scan the parent directory mapper pages 
     // - scan the directory entries in each 4 Kbytes page
@@ -1512 +1518 @@
     // get child inode cluster and local pointer
     cxy_t          inode_cxy = GET_CXY( child_inode_xp );
-    vfs_inode_t  * inode_ptr = (vfs_inode_t *)GET_PTR( child_inode_xp );
+    vfs_inode_t  * inode_ptr = GET_PTR( child_inode_xp );
+
+    // build extended pointer on parent dentried root
+    xptr_t parents_root_xp = XPTR( inode_cxy , &inode_ptr->parents );
+
+// check child inode has at least one parent
+assert( (xlist_is_empty( parents_root_xp ) == false ), "child inode must have one parent\n");
 
     // get dentry pointers and cluster
-    xptr_t         dentry_xp  = hal_remote_l64( XPTR( inode_cxy , &inode_ptr->parent_xp ) );  
+    xptr_t         dentry_xp  = XLIST_FIRST( parents_root_xp , vfs_dentry_t , parents );
     vfs_dentry_t * dentry_ptr = GET_PTR( dentry_xp );
     cxy_t          dentry_cxy = GET_CXY( dentry_xp );
 
-// dentry descriptor must be in same cluster as parent inode
+// check dentry descriptor in same cluster as parent inode
 assert( (dentry_cxy == local_cxy) , "illegal dentry cluster\n" );