Changeset e8d054a in mainline

Timestamp:

2012-03-05T10:40:06Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2f619d5

Parents:

e63ce679

Message:

very hidden bug (memory_leak) found in splitting data block - now correct (without splitting index block)

File:

• uspace/lib/ext4/libext4_directory_index.c (modified) (8 diffs)

uspace/lib/ext4/libext4_directory_index.c

@@ -383 +383 @@
                         result->block = leaf_block;
                         result->dentry = res_dentry;
-                        return EOK;
+                        goto cleanup;
                 }
 
@@ -400 +400 @@
         } while (rc == 1);
 
-        return ENOENT;
+        rc = ENOENT;
 
 cleanup:
@@ -464 +464 @@
         int rc = EOK;
 
+        // Allocate buffer for directory entries
         uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
         void *entry_buffer = malloc(block_size);
@@ -470 +471 @@
         }
 
-        // Copy data to buffer
-        memcpy(entry_buffer, old_data_block->data, block_size);
-
         // dot entry has the smallest size available
         uint32_t max_entry_count =  block_size / sizeof(ext4_directory_dx_dot_entry_t);
 
+        // Allocate sort entry
         ext4_dx_sort_entry_t *sort_array = malloc(max_entry_count * sizeof(ext4_dx_sort_entry_t));
         if (sort_array == NULL) {
@@ -482 +481 @@
         }
 
-        ext4_directory_entry_ll_t *dentry = old_data_block->data;
-
         uint32_t idx = 0;
         uint32_t real_size = 0;
-        void *entry_buffer_ptr = entry_buffer;
-
+
+        // Initialize hinfo
         ext4_hash_info_t tmp_hinfo;
         memcpy(&tmp_hinfo, hinfo, sizeof(ext4_hash_info_t));
 
+        // Load all valid entries to the buffer
+        ext4_directory_entry_ll_t *dentry = old_data_block->data;
+        void *entry_buffer_ptr = entry_buffer;
         while ((void *)dentry < old_data_block->data + block_size) {
 
                 // Read only valid entries
                 if (ext4_directory_entry_ll_get_inode(dentry) != 0) {
-                        char *name = (char *)dentry->name;
 
                         uint8_t len = ext4_directory_entry_ll_get_name_length(fs->superblock, dentry);
-                        ext4_hash_string(&tmp_hinfo, len, name);
+                        ext4_hash_string(&tmp_hinfo, len, (char *)dentry->name);
 
                         uint32_t rec_len = 8 + len;
@@ -788 +787 @@
         }
 
-        if (rc != EOK) {
-                goto terminate;
-        }
-
-
 // TODO check rc handling
-terminate:
         rc = block_put(new_block);
         if (rc != EOK) {
@@ -807 +800 @@
         rc = block_put(target_block);
         if (rc != EOK) {
-                return rc;
+                EXT4FS_DBG("error writing target block");
+//              return rc;
         }
 
@@ -814 +808 @@
 
         while (dx_it <= dx_block) {
+                EXT4FS_DBG("dirty = \%s, refcount = \%u", dx_it->block->dirty ? "true" : "false", dx_it->block->refcnt);
                 rc = block_put(dx_it->block);
                 if (rc != EOK) {
-                        return rc;
+                        EXT4FS_DBG("error writing index block");
+//                      return rc;
                 }
                 dx_it++;