Changeset 7eb033ce in mainline for uspace/lib/ext4/libext4_extent.c

Timestamp:

2012-04-12T03:03:36Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1fff583

Parents:

81ee87cd

Message:

not debugged version of dir index initialization

File:

• uspace/lib/ext4/libext4_extent.c (modified) (12 diffs)

uspace/lib/ext4/libext4_extent.c

@@ -559 +559 @@
                 uint32_t iblock)
 {
+        EXT4FS_DBG("");
         int rc;
 
@@ -568 +569 @@
         // Trivial way - no splitting
         if (entries < limit) {
+                EXT4FS_DBG("adding extent entry");
+
                 ext4_extent_header_set_entries_count(path_ptr->header, entries + 1);
                 path_ptr->extent = EXT4_EXTENT_FIRST(path_ptr->header) + entries;
@@ -581 +584 @@
                         ext4_superblock_get_block_size(inode_ref->fs->superblock);
 
-        // Trivial tree - grow
+        // Trivial tree - grow (extents were in root node)
         if (path_ptr == path) {
-
-//              EXT4FS_DBG("splitting extent root");
 
                 uint32_t new_fblock;
@@ -592 +593 @@
                         return rc;
                 }
-
-//              EXT4FS_DBG("allocated new node \%u", new_fblock);
 
                 block_t *block;
@@ -641 +640 @@
         }
 
+        assert(false);
+
         // start splitting
         uint32_t fblock = 0;
-
-        path_ptr--;
-
         while (path_ptr > path) {
+
+                // TODO
 
                 rc = ext4_balloc_alloc_block(inode_ref, &fblock);
@@ -674 +674 @@
                         path_ptr->extent = EXT4_EXTENT_FIRST(path_ptr->header);
                 }
+
+                path_ptr--;
+        }
+
+        // If splitting reached root node
+        if (path_ptr == path) {
+
+                uint32_t new_fblock;
+                rc = ext4_balloc_alloc_block(inode_ref, &new_fblock);
+                if (rc != EOK) {
+                        EXT4FS_DBG("error in block allocation");
+                        return rc;
+                }
+
+                block_t *block;
+                rc = block_get(&block, inode_ref->fs->device,
+                                new_fblock, BLOCK_FLAGS_NOREAD);
+                if (rc != EOK) {
+                        EXT4FS_DBG("error in block_get");
+                        return rc;
+                }
+
+                memset(block->data, 0, block_size);
+
+                // Move data from root to the new block
+                memcpy(block->data, inode_ref->inode->blocks,
+                                EXT4_INODE_BLOCKS * sizeof(uint32_t));
+
+                path_ptr++;
+                path_ptr->block = block;
+                path_ptr->header = (ext4_extent_header_t *)block->data;
+                path_ptr->depth = ext4_extent_header_get_depth(path_ptr->header);
+                path_ptr->index = NULL;
+
+                uint16_t entries = ext4_extent_header_get_entries_count(path_ptr->header);
+                path_ptr->extent = EXT4_EXTENT_FIRST(path_ptr->header) + entries;
+                ext4_extent_header_set_entries_count(path_ptr->header, entries + 1);
+                uint16_t limit = (block_size - sizeof(ext4_extent_header_t)) /
+                                sizeof(ext4_extent_t);
+                ext4_extent_header_set_max_entries_count(path_ptr->header, limit);
+
+                // Modify root (in inode)
+                path->depth = 1;
+                path->extent = NULL;
+                path->index = EXT4_EXTENT_FIRST_INDEX(path->header);
+
+                ext4_extent_header_set_depth(path->header, path_ptr->depth + 1);
+                ext4_extent_header_set_entries_count(path->header, 1);
+
+                ext4_extent_index_set_first_block(path->index, 0);
+                ext4_extent_index_set_leaf(path->index, new_fblock);
+
+                path_ptr->block->dirty = true;
+                path->block->dirty = true;
+
+                *last_path_item = path_ptr;
+
+                return EOK;
         }
 
@@ -682 +740 @@
                 uint32_t *iblock, uint32_t *fblock)
 {
+        EXT4FS_DBG("");
         int rc = EOK;
 
@@ -726 +785 @@
                         rc = ext4_balloc_alloc_block(inode_ref, &phys_block);
                         if (rc != EOK) {
-                        // TODO error, cleanup
-                                assert(false);
+                                goto finish;
                         }
 
@@ -745 +803 @@
                         rc = ext4_balloc_try_alloc_block(inode_ref, phys_block, &free);
                         if (rc != EOK) {
-                                // TODO error
-                                assert(false);
+                                goto finish;
                         }
 
                         if (! free) {
                                 // target is not free
-//                              EXT4FS_DBG("target not free, \%u", phys_block);
                                 goto append_extent;
                         }
@@ -763 +819 @@
                 }
         }
-
-        assert(false);
 
 append_extent:
@@ -776 +830 @@
         }
 
-//      EXT4FS_DBG("allocated \%u", phys_block);
-
         rc = ext4_extent_append_extent(inode_ref, path, &path_ptr, new_block_idx);
         if (rc != EOK) {
@@ -794 +846 @@
         *iblock = new_block_idx;
         *fblock = phys_block;
-
-//      EXT4FS_DBG("iblock = \%u, fblock = \%u", new_block_idx, phys_block);
 
         // Put loaded blocks