Changeset 561 for trunk/kernel/fs

Timestamp:

Sep 21, 2018, 10:26:47 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Remove y_max in all functions except dqdt_init()

Location:

trunk/kernel/fs

Files:

• ramfs.c (modified) (1 diff)
• vfs.c (modified) (2 diffs)
• vfs.h (modified) (1 diff)

trunk/kernel/fs/ramfs.c

@@ -38 +38 @@
     xptr_t    root_inode_xp;   // unused                      
  
-    cxy_t     cxy = vfs_cluster_random_select();
+    cxy_t     cxy = cluster_random_select();
 
     // create VFS dentry and VFS inode for RAMFS root directory

trunk/kernel/fs/vfs.c

@@ -1124 +1124 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 
-/////////////////////////////////
-cxy_t vfs_cluster_random_select( void )
-{
-    uint32_t  x_max     = LOCAL_CLUSTER->x_max; // [FIXME]
-    uint32_t  y_max     = LOCAL_CLUSTER->y_max; // [FIXME]
-    uint32_t  y_width   = LOCAL_CLUSTER->y_width;
-    uint32_t  index     = ( hal_get_cycles() + hal_get_gid() ) % (x_max * y_max); // [FIXME]
-    uint32_t  x         = index / y_max; // [FIXME]
-    uint32_t  y         = index % y_max; // [FIXME]
-
-    return (x<<y_width) + y;
-}
-
 
 //////////////////////////////////////////////////////////////////////////
@@ -1512 +1499 @@
 
             // select a cluster for missing inode
-            child_cxy = vfs_cluster_random_select();
+            child_cxy = cluster_random_select();
  
             // insert a new child dentry/inode in inode tree

trunk/kernel/fs/vfs.h

@@ -517 +517 @@
 
 /****************************************************************************************** 
- * This function randomly selects a cluster for a new inode.
- ******************************************************************************************
- * @ returns the selected cluster identifier.
- *****************************************************************************************/
-cxy_t vfs_cluster_random_select( void );
-
-/****************************************************************************************** 
  * This function returns in a kernel buffer allocated by the caller function,
  * the pathname of a file/dir identified by an extended pointer on the inode.