Changeset 412f813 in mainline

Timestamp:

2012-02-28T19:18:39Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

e2ec667e

Parents:

41998ec

Message:

some small improvements of splitting directory index data blocks

Location:

uspace/lib/ext4

Files:

• libext4_balloc.c (modified) (2 diffs)
• libext4_directory_index.c (modified) (4 diffs)

uspace/lib/ext4/libext4_balloc.c

@@ -242 +242 @@
 }
 
-int ext4_balloc_alloc_block(ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, uint32_t *fblock)
+int ext4_balloc_alloc_block(ext4_filesystem_t *fs,
+                ext4_inode_ref_t *inode_ref, uint32_t *fblock)
 {
         int rc;
@@ -462 +463 @@
 
         // Update inode blocks (different block size!) count
+
         uint64_t ino_blocks = ext4_inode_get_blocks_count(fs->superblock, inode_ref->inode);
         ino_blocks += block_size / EXT4_INODE_BLOCK_SIZE;

uspace/lib/ext4/libext4_directory_index.c

@@ -510 +510 @@
 
         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);
-                ext4_hash_string(&tmp_hinfo, len, name);
-
-                uint32_t rec_len = 8 + len;
-
-                if ((rec_len % 4) != 0) {
-                        rec_len += 4 - (rec_len % 4);
-                }
-
-                memcpy(entry_buffer_ptr, dentry, rec_len);
-
-                sort_array[idx].dentry = entry_buffer_ptr;
-                sort_array[idx].rec_len = rec_len;
-                sort_array[idx].hash = tmp_hinfo.hash;
-
-                entry_buffer_ptr += rec_len;
-                real_size += rec_len;
-
-                idx++;
+
+                // 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);
+
+                        uint32_t rec_len = 8 + len;
+
+                        if ((rec_len % 4) != 0) {
+                                rec_len += 4 - (rec_len % 4);
+                        }
+
+                        memcpy(entry_buffer_ptr, dentry, rec_len);
+
+                        sort_array[idx].dentry = entry_buffer_ptr;
+                        sort_array[idx].rec_len = rec_len;
+                        sort_array[idx].hash = tmp_hinfo.hash;
+
+                        entry_buffer_ptr += rec_len;
+                        real_size += rec_len;
+                        idx++;
+                }
+
                 dentry = (void *)dentry + ext4_directory_entry_ll_get_entry_length(dentry);
         }
@@ -571 +575 @@
         }
 
+        uint32_t continued = 0;
+        if (new_hash == sort_array[mid-1].hash) {
+                continued = 1;
+        }
+
         uint32_t offset = 0;
         void *ptr;
@@ -624 +633 @@
 
         ext4_directory_dx_entry_set_block(new_index_entry, new_iblock);
-        ext4_directory_dx_entry_set_hash(new_index_entry, new_hash);
+        ext4_directory_dx_entry_set_hash(new_index_entry, new_hash + continued);
 
         ext4_directory_dx_countlimit_set_count(countlimit, count + 1);
@@ -844 +853 @@
 success:
 
-        block_put(target_block);
-        block_put(new_block);
+        rc = block_put(target_block);
+        if (rc != EOK) {
+                EXT4FS_DBG("error writing target block");
+        }
+        rc = block_put(new_block);
+        if (rc != EOK) {
+                EXT4FS_DBG("error writing new block");
+        }
 
         ext4_directory_dx_block_t *dx_it = dx_blocks;
 
         while (dx_it <= dx_block) {
-                block_put(dx_it->block);
+                rc = block_put(dx_it->block);
+                if (rc != EOK) {
+                        EXT4FS_DBG("error writing index block \%u", (uint32_t)dx_it->block->pba);
+                }
                 dx_it++;
         }