Changeset 797 for soft

Timestamp:

Mar 2, 2016, 2:26:49 PM (9 years ago)

Author:

alain

Message:

Fix a bug in _all_clusters_allocate()

File:

• soft/giet_vm/giet_fat32/fat32.c (modified) (6 diffs)

soft/giet_vm/giet_fat32/fat32.c

@@ -686 +686 @@
 
 
-///////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////
 static unsigned int _get_free_cluster( unsigned int*  cluster )  
 {
@@ -932 +932 @@
 static unsigned int _cluster_release( unsigned int cluster )
 {
-    if ( cluster >= END_OF_CHAIN_CLUSTER_MIN )  // terminal case : nothing to do
-    {
-        return 0;        
-    }
-    else                 // non terminal case : recursive call, then release cluster
+    if ( cluster < END_OF_CHAIN_CLUSTER_MIN )  // non terminal case
     {
         // get next cluster
@@ -942 +938 @@
         if ( _get_fat_entry( cluster , &next ) ) 
         {
-            _printf("\n[FAT ERROR] in _cluster_release() accessing Fat-Cache"
+            _printf("\n[FAT ERROR] in _cluster_release() scanning Fat-Cache"
                     " for cluster %x\n", cluster );
             return 1;
         }
 
-        // call _cluster_release() on next
+        // call _cluster_release() on next cluster
         if ( _cluster_release( next ) ) return 1;
-        
-        // release current cluster
-        if ( _set_fat_entry( cluster , FREE_CLUSTER ) )
-        {
-            _printf("\n[FAT ERROR] in _cluster_release() updating Fat-Cache"
-                    " for cluster %x\n", cluster );
-            return 1;
-        }
-
-        // update free_cluster _hint and free_clusters_number in FAT descriptor
-        _fat.free_clusters_number++;
-        if ( cluster < _fat.free_cluster_hint ) _fat.free_cluster_hint = cluster;
-
-        return 0;
-    }
+    }       
+
+    // In both cases (terminal or not) release cluster
+    if ( _set_fat_entry( cluster , FREE_CLUSTER ) )
+    {
+        _printf("\n[FAT ERROR] in _cluster_release() updating Fat-Cache"
+                " for cluster %x\n", cluster );
+        return 1;
+    }
+
+    // Update free_cluster _hint and free_clusters_number in FAT descriptor
+    _fat.free_clusters_number++;
+    if ( cluster < _fat.free_cluster_hint ) _fat.free_cluster_hint = cluster;
+
+    return 0;
+
 }  // end _cluster_release()
 
@@ -969 +966 @@
 static unsigned int _all_clusters_release( fat_inode_t* inode )
 {
-    // release recursively all clusters in FAT chaining,
-    // starting from last cluster in chain, ending by first. 
+    // release recursively all clusters in FAT chaining reverse order
+    // starting from last cluster in chain, ending by first.
+ 
     if ( _cluster_release( inode->cluster ) )
     {
@@ -989 +987 @@
     if ( _update_fs_info() )
     {
-        _printf("\n[FAT ERROR] in _all_clusters_release() updating FS_INFO sector on device\n");
+        _printf("\n[FAT ERROR] in _all_clusters_release() updating FS_INFO sector\n");
         return 1;
     }
+
+    // update cluster field in inode
+    inode->cluster = END_OF_CHAIN_CLUSTER_MIN;
 
 #if GIET_DEBUG_FAT
@@ -2626 +2627 @@
     {
         // empty file
-        child->size = 0;
+        child->size   = 0;
         child->levels = _get_levels_from_size( child->size );