Changeset 50601ef in mainline

Timestamp:

2012-02-08T19:38:26Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

03934c9e

Parents:

565b6ff

Message:

small code modification / reorganization

File:

• uspace/lib/ext4/libext4_directory.c (modified) (5 diffs)

uspace/lib/ext4/libext4_directory.c

@@ -313 +313 @@
 
         // Linear algorithm
-        uint16_t required_len = 8 + name_len + (4 - name_len % 4);
 
         ext4_directory_iterator_t it;
@@ -322 +321 @@
 
         uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
+        uint16_t required_len = 8 + name_len + (4 - name_len % 4);
 
         while (it.current != NULL) {
@@ -328 +328 @@
 
                 if ((entry_inode == 0) && (rec_len >= required_len)) {
-
 
                         ext4_directory_write_entry(fs->superblock, it.current, rec_len,
@@ -349 +348 @@
 
                         if (free_space >= required_len) {
-                                uint16_t used_len = rec_len - free_space;
 
                                 // Cut tail of current entry
-                                ext4_directory_entry_ll_set_entry_length(it.current, used_len);
+                                ext4_directory_entry_ll_set_entry_length(it.current, used_space);
 
                                 // SEEK manually
                                 uint32_t local_offset = (it.current_offset % block_size);
-                                local_offset += used_len;
+                                local_offset += used_space;
                                 ext4_directory_entry_ll_t *new_entry = it.current_block->data + local_offset;
 
@@ -375 +373 @@
                 }
         }
+
+        EXT4FS_DBG("NO FREE SPACE - needed to allocate block");
 
         // Save position and destroy iterator