Changeset 633 for trunk/kernel/fs/vfs.c

Timestamp:

May 28, 2019, 6:10:15 PM (5 years ago)

Author:

alain

Message:

cosmetic

File:

• trunk/kernel/fs/vfs.c (modified) (14 diffs)

trunk/kernel/fs/vfs.c

@@ -1021 +1021 @@
     xptr_t        iter_xp;          // iterator on xlist
     mapper_t    * mapper_ptr;       // local pointer on associated mapper
-    xptr_t        mapper_xp;        // extended pointer on mapper
     vfs_inode_t * inode_ptr;        // local pointer on associated inode
-    xptr_t        inode_xp;         // extended pointer on inode
     uint32_t      size;             // current file size (from inode descriptor)
     error_t       error;
@@ -1052 +1050 @@
     //////// 1) update all dirty pages from mapper to device
 
-    // get pointers on mapper associated to file
+    // get local pointer on mapper associated to file
     mapper_ptr = hal_remote_lpt( XPTR( file_cxy , &file_ptr->mapper ) );
-    mapper_xp  = XPTR( file_cxy , mapper_ptr );
 
     // copy all dirty pages from mapper to device
@@ -1083 +1080 @@
     //////// 2) update file size in all parent directory mapper(s) and update device
 
-    // get pointers on remote inode
+    // get local pointer on remote inode
     inode_ptr = hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
-    inode_xp  = XPTR( file_cxy , inode_ptr );
 
     // get file size from remote inode
@@ -1701 +1697 @@
     // build extended pointer on lock protecting Inode Tree (in VFS root inode)
     vfs_root_xp  = process->vfs_root_xp;
-    vfs_root_ptr = GET_PTR( root_xp );
-    vfs_root_cxy = GET_CXY( root_xp );
+    vfs_root_ptr = GET_PTR( vfs_root_xp );
+    vfs_root_cxy = GET_CXY( vfs_root_xp );
     lock_xp      = XPTR( vfs_root_cxy , &vfs_root_ptr->main_lock );
 
@@ -2108 +2104 @@
     cxy_t             inode_cxy;    // inode cluster identifier       
     vfs_inode_t     * inode_ptr;    // inode local pointer
-    vfs_inode_type_t  inode_type;   // target inode type
 
 // check lookup working mode
@@ -2127 +2122 @@
     
     // get inode type from remote inode
-    inode_type = hal_remote_l32( XPTR( inode_cxy , &inode_ptr->type ) );
-
-    // TODO implement this function
+    // inode_type = hal_remote_l32( XPTR( inode_cxy , &inode_ptr->type ) );
+
+    // TODO finalize implementation
 
 assert( false , "not implemented" );
+
+    // set inode rights in remote inode
+    hal_remote_s32( XPTR( inode_cxy , &inode_ptr->rights ) , rights );
 
     return 0;
@@ -2473 +2471 @@
     bool_t             last;         // true when the name is the last in path
     bool_t             found;        // true when a child has been found
-    bool_t             dir;          // searched inode is a directory
     bool_t             create;       // searched inode must be created if not found
     bool_t             excl;         // searched inode must not exist
@@ -2498 +2495 @@
 
     // compute lookup flags
-    dir    = (lookup_mode & VFS_LOOKUP_DIR)    == VFS_LOOKUP_DIR;
     create = (lookup_mode & VFS_LOOKUP_CREATE) == VFS_LOOKUP_CREATE;
     excl   = (lookup_mode & VFS_LOOKUP_EXCL)   == VFS_LOOKUP_EXCL;
@@ -2879 +2875 @@
     vfs_inode_t   * child_ptr;         // local pointer on child inode directory
     cxy_t           child_cxy;         // child inode directory cluster identifier
-    vfs_inode_t   * parent_ptr;        // local pointer on parent inode directory
-    cxy_t           parent_cxy;        // parent inode directory cluster identifier
     vfs_ctx_t     * ctx_ptr;           // local pointer on child inode FS context
     vfs_fs_type_t   fs_type;           // FS type of child inode
@@ -2906 +2900 @@
     child_cxy  = GET_CXY( child_xp );
     child_ptr  = GET_PTR( child_xp );
-
-    // get parent directory cluster and local pointer
-    parent_cxy = GET_CXY( parent_xp );
-    parent_ptr = GET_PTR( parent_xp );
 
     // get child inode FS type
@@ -3052 +3042 @@
 
     // don't register <..> dentry in parent_inode xlist of parents 
-    // parents_root_xp  = XPTR( parent_cxy , &parent_ptr->parents );
-    // parents_entry_xp = XPTR( child_cxy  , &dentry_ptr->parents );
-    // xlist_add_first( parents_root_xp , parents_entry_xp );
-    // hal_remote_atomic_add( XPTR( parent_cxy , &parent_ptr->links ) , 1 );
 
     // update "parent" and "child_xp" fields in <..> dentry
@@ -3369 +3355 @@
 #if(DEBUG_VFS_ADD_CHILD & 1)
 if( DEBUG_VFS_ADD_CHILD < cycle )
-printk("\n[%s] thread[%x,%x] / dentry (%x,%x) registered in child inode (%x,%x)\n",
+printk("\n[%s] thread[%x,%x] link dentry(%x,%x) to child inode(%x,%x)\n",
 __FUNCTION__, this->process->pid, this->trdid, 
 parent_cxy, new_dentry_ptr, child_cxy, new_inode_ptr );
@@ -3381 +3367 @@
 #if(DEBUG_VFS_ADD_CHILD & 1)
 if( DEBUG_VFS_ADD_CHILD < cycle )
-printk("\n[%s] thread[%x,%x] / dentry (%x,%x) registered in parent inode (%x,%x)\n",
+printk("\n[%s] thread[%x,%x] link dentry(%x,%x) to parent inode(%x,%x)\n",
 __FUNCTION__, this->process->pid, this->trdid, 
 parent_cxy, new_dentry_ptr, parent_cxy, parent_inode_ptr );
@@ -3394 +3380 @@
 if( DEBUG_VFS_ADD_CHILD < cycle )
 printk("\n[%s] thread[%x,%x] exit for <%s> / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, name, (uint32_t)hal_get_cycles() );
+__FUNCTION__, this->process->pid, this->trdid, name, cycle );
 #endif