Changeset 409 for trunk/kernel/fs

Timestamp:

Dec 20, 2017, 4:51:09 PM (6 years ago)

Author:

alain

Message:

Fix bugs in exec

Location:

trunk/kernel/fs

Files:

• vfs.c (modified) (4 diffs)
• vfs.h (modified) (1 diff)

trunk/kernel/fs/vfs.c

@@ -335 +335 @@
 ////////////////////////////////////////////
 void vfs_inode_set_size( xptr_t    inode_xp,
-                              uint32_t  size )
+                         uint32_t  size )
 {
     // get inode cluster and local pointer
@@ -370 +370 @@
 
 /////////////////////////////////////////
-xptr_t vfs_inode_owner( xptr_t inode_xp )
-{
-    // get inode cluster and local pointer
-    cxy_t         cxy = GET_CXY( inode_xp );
-    vfs_inode_t * ptr = (vfs_inode_t *)GET_PTR( inode_xp );
-
-    // get the main lock
-    return remote_spinlock_owner( XPTR( cxy , &ptr->main_lock ) );
-}
-
-/////////////////////////////////////////
-void vfs_inode_display( xptr_t inode_xp )
+void vfs_inode_get_name( xptr_t inode_xp,
+                         char * name )
 {
     cxy_t          inode_cxy;
@@ -389 +379 @@
     vfs_dentry_t * dentry_ptr;
     
-    char           name[CONFIG_VFS_MAX_NAME_LENGTH];
-
     // get inode cluster and local pointer
     inode_cxy = GET_CXY( inode_xp );
@@ -411 +399 @@
                            XPTR( dentry_cxy , &dentry_ptr->name ) );
     }
-
-    // display inode header
-    printk("\n***** inode <%s> [%x in cluster %x]\n",
-           name , GET_PTR(inode_xp) , GET_CXY(inode_xp) );
-
-    // display children from xhtab
-    xhtab_display( XPTR( inode_cxy , &inode_ptr->children ) );
-
-}  // end vfs_inode_display()
+}  // end vfs_inode_get_name()
 
 ////////////////////////////////////////////////////////////////////////////////////////////

trunk/kernel/fs/vfs.h

@@ -421 +421 @@
 
 /****************************************************************************************** 
- * This debug function returns the current owner of the inode main lock.
+ * This debug function copies the name of a remote inode identified by the <inode_xp>
+ * argument to a local buffer identified by the <name> argument.
+ * The local buffer size must be at least CONFIG_VFS_MAX_NAME_LENGTH. 
  *****************************************************************************************
  * @ inode_xp  : extended pointer on the remote inode.
- * @ return extended pointer on owner thread / return XPTR_NULL if lock not taken.
- *****************************************************************************************/
-xptr_t vfs_inode_owner( xptr_t inode_xp );
-
-/****************************************************************************************** 
- * This debug function diplays the name of the inode identified by the <inode_xp>
- * argument, and all children names for a directory.
- *****************************************************************************************
- * @ inode_xp  : extended pointer on the remote inode.
- *****************************************************************************************/
-void vfs_inode_display( xptr_t inode_xp );
+ * @ name      : local buffer pointer.
+ *****************************************************************************************/
+void vfs_inode_get_name( xptr_t inode_xp,
+                         char * name );