Changeset b6d7b7c in mainline

Timestamp:

2012-04-14T16:29:09Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1df3f57a

Parents:

831507b

Message:

debugged block appending to extent + directory index initialization

Location:

uspace

Files:

• lib/ext4/libext4_directory.c (modified) (2 diffs)
• lib/ext4/libext4_extent.c (modified) (5 diffs)
• lib/ext4/libext4_filesystem.c (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

uspace/lib/ext4/libext4_directory.c

@@ -372 +372 @@
         }
 
-        EXT4FS_DBG("loaded");
-
         // Fill block with zeroes
         memset(new_block->data, 0, block_size);
         ext4_directory_entry_ll_t *block_entry = new_block->data;
         ext4_directory_write_entry(fs->superblock, block_entry, block_size, child, name, name_len);
-
-        EXT4FS_DBG("written");
 
         // Save new block
@@ -387 +383 @@
                 return rc;
         }
-
-        EXT4FS_DBG("returning");
 
         return EOK;

uspace/lib/ext4/libext4_extent.c

@@ -769 +769 @@
         }
 
-        uint32_t phys_block = 0;
-
         // Add new extent to the node
         if (path_ptr->extent == NULL) {
@@ -779 +777 @@
         uint16_t block_limit = (1 << 15);
 
+        uint32_t phys_block = 0;
         if (block_count < block_limit) {
 
@@ -791 +790 @@
                         ext4_extent_set_start(path_ptr->extent, phys_block);
                         ext4_extent_set_block_count(path_ptr->extent, 1);
+
+                        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+                        inode_ref->dirty = true;
 
                         path_ptr->block->dirty = true;
@@ -813 +815 @@
 
                         ext4_extent_set_block_count(path_ptr->extent, block_count + 1);
+
+                        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+                        inode_ref->dirty = true;
 
                         path_ptr->block->dirty = true;
@@ -840 +845 @@
         ext4_extent_set_start(path_ptr->extent, phys_block);
 
+        ext4_inode_set_size(inode_ref->inode, inode_size + block_size);
+        inode_ref->dirty = true;
+
         path_ptr->block->dirty = true;
 

uspace/lib/ext4/libext4_filesystem.c

@@ -594 +594 @@
                 rc = ext4_extent_find_block(inode_ref, iblock, &current_block);
 
-                EXT4FS_DBG("ext: loading iblock \%u, address \%u", (uint32_t)iblock, current_block);
-
                 if (rc != EOK) {
                         return rc;

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -616 +616 @@
 
                 // Initialize directory index if necessary
-//              if (ext4_superblock_has_feature_compatible(
-//                              fs->superblock, EXT4_FEATURE_COMPAT_DIR_INDEX)) {
-//
-//                      rc = ext4_directory_dx_init(child->inode_ref);
-//                      if (rc != EOK) {
-//                              return rc;
-//                      }
-//
-//                      ext4_inode_set_flag(child->inode_ref->inode, EXT4_INODE_FLAG_INDEX);
-//                      child->inode_ref->dirty = true;
-//              }
+                if (ext4_superblock_has_feature_compatible(
+                                fs->superblock, EXT4_FEATURE_COMPAT_DIR_INDEX)) {
+
+                        rc = ext4_directory_dx_init(child->inode_ref);
+                        if (rc != EOK) {
+                                return rc;
+                        }
+
+                        ext4_inode_set_flag(child->inode_ref->inode, EXT4_INODE_FLAG_INDEX);
+                        child->inode_ref->dirty = true;
+                }
 
                 uint16_t parent_links = ext4_inode_get_links_count(parent->inode_ref->inode);