Changeset c4f318d6 in mainline

Timestamp:

2012-02-25T21:24:08Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

a61ddcf4

Parents:

89a30bd

Message:

some fixes in splitting data blocks (dx_add_entry), not debugged completely

Location:

uspace/lib/ext4

Files:

• libext4_directory.c (modified) (3 diffs)
• libext4_directory.h (modified) (1 diff)
• libext4_directory_index.c (modified) (12 diffs)

uspace/lib/ext4/libext4_directory.c

@@ -261 +261 @@
 
 int ext4_directory_append_block(ext4_filesystem_t *fs,
-                ext4_inode_ref_t *inode_ref, uint32_t *fblock)
+                ext4_inode_ref_t *inode_ref, uint32_t *fblock, uint32_t *iblock)
 {
         int rc;
@@ -288 +288 @@
 
         *fblock = phys_block;
+        *iblock = new_block_idx;
         return EOK;
 }
@@ -411 +412 @@
 
         uint32_t fblock;
-        rc = ext4_directory_append_block(fs, parent, &fblock);
+        uint32_t iblock;
+        rc = ext4_directory_append_block(fs, parent, &fblock, &iblock);
         if (rc != EOK) {
                 return rc;

uspace/lib/ext4/libext4_directory.h

@@ -94 +94 @@
 
 extern int ext4_directory_append_block(ext4_filesystem_t *,
-                ext4_inode_ref_t *, uint32_t *);
+                ext4_inode_ref_t *, uint32_t *, uint32_t *);
 
 extern void ext4_directory_write_entry(ext4_superblock_t *,

uspace/lib/ext4/libext4_directory_index.c

@@ -456 +456 @@
         uint32_t hash;
         uint32_t rec_len;
-        ext4_directory_entry_ll_t *dentry;
+        void *dentry;
 } ext4_dx_sort_entry_t;
 
@@ -491 +491 @@
         memcpy(entry_buffer, old_data_block->data, block_size);
 
-        ext4_directory_dx_countlimit_t *countlimit =
-                        (ext4_directory_dx_countlimit_t *)index_block->entries;
-        uint32_t entry_count = ext4_directory_dx_countlimit_get_count(countlimit);
-        ext4_dx_sort_entry_t *sort_array = malloc(entry_count);
+        // dot entry has the smalest size available
+        uint32_t entry_count =  block_size / sizeof(ext4_directory_dx_dot_entry_t);
+
+        ext4_dx_sort_entry_t *sort_array = malloc(entry_count * sizeof(ext4_dx_sort_entry_t));
         if (sort_array == NULL) {
                 free(entry_buffer);
@@ -500 +500 @@
         }
 
+        EXT4FS_DBG("sort_array allocated addr = \%u, size = \%u", (uint32_t)sort_array, entry_count * sizeof(ext4_dx_sort_entry_t));
+
         ext4_directory_entry_ll_t *dentry = old_data_block->data;
+
+        // TODO tady nekde je chyba
+
+        EXT4FS_DBG("entry_buffer = \%u", (uint32_t)entry_buffer);
 
         int idx = 0;
@@ -507 +513 @@
         while ((void *)dentry < old_data_block->data + block_size) {
                 char *name = (char *)dentry->name;
+
                 uint8_t len = ext4_directory_entry_ll_get_name_length(fs->superblock, dentry);
                 uint32_t hash = ext4_hash_string(hinfo, len, name);
@@ -532 +539 @@
 
         uint32_t new_fblock;
-        rc = ext4_directory_append_block(fs, inode_ref, &new_fblock);
+        uint32_t new_iblock;
+        rc = ext4_directory_append_block(fs, inode_ref, &new_fblock, &new_iblock);
         if (rc != EOK) {
                 free(sort_array);
@@ -538 +546 @@
                 return rc;
         }
+
+        EXT4FS_DBG("new block appended (iblock = \%u)", new_iblock);
 
         // Load new block
@@ -603 +613 @@
         free(entry_buffer);
 
-        // TODO add new entry to index block
+        ext4_directory_dx_countlimit_t *countlimit =
+                        (ext4_directory_dx_countlimit_t *)index_block->entries;
+        uint32_t count = ext4_directory_dx_countlimit_get_count(countlimit);
+        count++;
+        ext4_directory_dx_countlimit_set_count(countlimit, count);
+
         index_block->position++;
 
-        ext4_directory_dx_entry_set_block(index_block->position, new_fblock);
+        ext4_directory_dx_entry_set_block(index_block->position, new_iblock);
         ext4_directory_dx_entry_set_hash(index_block->position, new_hash);
 
@@ -682 +697 @@
                         ext4_directory_write_entry(fs->superblock, de, de_rec_len,
                                 child, name, name_size);
+
+                                // TODO cleanup
                                 target_block->dirty = true;
                                 rc = block_put(target_block);
@@ -702 +719 @@
                         if (free_space >= required_len) {
 
-                                EXT4FS_DBG("rec_len = \%u, used_space = \%u, free space = \%u", de_rec_len, used_space, free_space);
-
                                 // Cut tail of current entry
                                 ext4_directory_entry_ll_set_entry_length(de, used_space);
@@ -709 +724 @@
                                 ext4_directory_write_entry(fs->superblock, new_entry,
                                         free_space, child, name, name_size);
+
+                                // TODO cleanup
                                 target_block->dirty = true;
                                 rc = block_put(target_block);
@@ -729 +746 @@
         uint16_t leaf_count = ext4_directory_dx_countlimit_get_count((ext4_directory_dx_countlimit_t *)entries);
 
-        ext4_directory_dx_entry_t *root_entries = ((ext4_directory_dx_node_t *) dx_blocks[0].block->data)->entries;
+//      ext4_directory_dx_entry_t *root_entries = ((ext4_directory_dx_node_t *) dx_blocks[0].block->data)->entries;
 
         if (leaf_limit == leaf_count) {
                 EXT4FS_DBG("need to split index block !!!");
 
-                unsigned int levels = dx_block - dx_blocks;
-
-                uint16_t root_limit = ext4_directory_dx_countlimit_get_limit((ext4_directory_dx_countlimit_t *)root_entries);
-                uint16_t root_count = ext4_directory_dx_countlimit_get_count((ext4_directory_dx_countlimit_t *)root_entries);
-
-                if ((levels > 0) && (root_limit == root_count)) {
-                        EXT4FS_DBG("Directory index is full");
-
-                        // ENOSPC - cleanup !!!
-                        return ENOSPC;
-                }
-
-                uint32_t fblock;
-                rc =  ext4_directory_append_block(fs, parent, &fblock);
-                if (rc != EOK) {
-                        // TODO error
-                }
-
-                // New block allocated
-                block_t * new_block;
-                rc = block_get(&new_block, fs->device, fblock, BLOCK_FLAGS_NOREAD);
-                if (rc != EOK) {
-                        // TODO error
-                }
-
-                memset(new_block->data, 0, block_size);
-
-                if (levels > 0) {
-                        EXT4FS_DBG("split index");
-                } else {
-                        EXT4FS_DBG("create second level");
-                }
-        }
-
-        block_t *new_block;
+//              unsigned int levels = dx_block - dx_blocks;
+//
+//              uint16_t root_limit = ext4_directory_dx_countlimit_get_limit((ext4_directory_dx_countlimit_t *)root_entries);
+//              uint16_t root_count = ext4_directory_dx_countlimit_get_count((ext4_directory_dx_countlimit_t *)root_entries);
+//
+//              if ((levels > 0) && (root_limit == root_count)) {
+//                      EXT4FS_DBG("Directory index is full");
+//
+//                      // ENOSPC - cleanup !!!
+//                      return ENOSPC;
+//              }
+//
+//              uint32_t fblock;
+//              rc =  ext4_directory_append_block(fs, parent, &fblock);
+//              if (rc != EOK) {
+//                      // TODO error
+//              }
+//
+//              // New block allocated
+//              block_t * new_block;
+//              rc = block_get(&new_block, fs->device, fblock, BLOCK_FLAGS_NOREAD);
+//              if (rc != EOK) {
+//                      // TODO error
+//              }
+//
+//              memset(new_block->data, 0, block_size);
+//
+//              if (levels > 0) {
+//                      EXT4FS_DBG("split index");
+//              } else {
+//                      EXT4FS_DBG("create second level");
+//              }
+        }
+
+        block_t *new_block = NULL;
         rc = ext4_directory_dx_split_data(fs, parent, &hinfo, target_block, dx_block, &new_block);
         if (rc != EOK) {
@@ -775 +792 @@
 
         // TODO Where to save new entry
-
-
-        // TODO
+        // Position in dx_block is set to NEW block entry
+        uint32_t new_block_hash = ext4_directory_dx_entry_get_hash(dx_block->position);
+        if (hinfo.hash >= new_block_hash) {
+                de = new_block->data;
+                stop = new_block->data + block_size;
+        } else {
+                de = target_block->data;
+                stop = target_block->data + block_size;
+        }
+
+        while (de < stop) {
+
+                uint32_t de_inode = ext4_directory_entry_ll_get_inode(de);
+                uint16_t de_rec_len = ext4_directory_entry_ll_get_entry_length(de);
+
+                if ((de_inode == 0) && (de_rec_len >= required_len)) {
+                        ext4_directory_write_entry(fs->superblock, de, de_rec_len,
+                                child, name, name_size);
+                                goto success;
+                }
+
+                if (de_inode != 0) {
+                        uint16_t used_name_len = ext4_directory_entry_ll_get_name_length(
+                                        fs->superblock, de);
+
+                        uint16_t used_space = 8 + used_name_len;
+                        if ((used_name_len % 4) != 0) {
+                                used_space += 4 - (used_name_len % 4);
+                        }
+                        uint16_t free_space = de_rec_len - used_space;
+
+                        if (free_space >= required_len) {
+
+                                EXT4FS_DBG("rec_len = \%u, used_space = \%u, free space = \%u", de_rec_len, used_space, free_space);
+
+                                // Cut tail of current entry
+                                ext4_directory_entry_ll_set_entry_length(de, used_space);
+                                ext4_directory_entry_ll_t *new_entry = (void *)de + used_space;
+                                ext4_directory_write_entry(fs->superblock, new_entry,
+                                        free_space, child, name, name_size);
+
+                                goto success;
+                        }
+
+                }
+
+                de = (void *)de + de_rec_len;
+        }
+
+success:
+
+        block_put(target_block);
+        block_put(new_block);
+
+        ext4_directory_dx_block_t *dx_it = dx_blocks;
+
+        while (dx_it <= dx_block) {
+                block_put(dx_it->block);
+                dx_it++;
+        }
+
         return EOK;
-
 }