Changeset b12ca16 in mainline for uspace/lib/ext4/libext4_filesystem.c

Timestamp:

2011-11-18T15:30:24Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d5ba17f

Parents:

e18de3c

Message:

improved block allocator - but has some bugs

File:

• uspace/lib/ext4/libext4_filesystem.c (modified) (6 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -72 +72 @@
 
         /* Initialize block caching */
-        // TODO set cache MODE to write through (now writeback for faster testing)
-        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WB);
+        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT);
         if (rc != EOK) {
                 block_fini(fs->device);
@@ -387 +386 @@
                 // TODO
                 return ENOTSUP;
-
         }
 
@@ -418 +416 @@
 
         if (current_block == 0) {
-                rc = ext4_bitmap_alloc_block(fs, inode_ref, &new_block_addr);
+                rc = ext4_balloc_alloc_block(fs, inode_ref, &new_block_addr);
                 if (rc != EOK) {
                         // TODO error
@@ -460 +458 @@
                 current_block = uint32_t_le2host(((uint32_t*)block->data)[offset_in_block]);
 
-                if (current_block == 0) {
-                        if (level > 1) {
-
-                                rc = ext4_bitmap_alloc_block(fs, inode_ref, &new_block_addr);
-                                if (rc != EOK) {
-                                        // TODO error
-                                        EXT4FS_DBG("allocation error");
-                                }
-
-                                rc = block_get(&new_block, fs->device, new_block_addr, BLOCK_FLAGS_NOREAD);
-                                if (rc != EOK) {
-                                        // TODO error
-
-                                        EXT4FS_DBG("BBB: error block loading");
-
-                                }
-                                memset(new_block->data, 0, block_size);
-                                new_block->dirty = true;
-
-                                block_put(new_block);
-
-                                ((uint32_t*)block->data)[offset_in_block] = host2uint32_t_le(new_block_addr);
-                                block->dirty = true;
-                                current_block = new_block_addr;
-                        } else {
-                                ((uint32_t*)block->data)[offset_in_block] = host2uint32_t_le(fblock);
-                                block->dirty = true;
+                if ((level > 1) && (current_block == 0)) {
+                        rc = ext4_balloc_alloc_block(fs, inode_ref, &new_block_addr);
+                        if (rc != EOK) {
+                                // TODO error
+                                EXT4FS_DBG("allocation error");
                         }
+                        EXT4FS_DBG("BBB: new addr \%u, offset = \%u, level = \%u", new_block_addr, offset_in_block, level);
+
+                        rc = block_get(&new_block, fs->device, new_block_addr, BLOCK_FLAGS_NOREAD);
+                        if (rc != EOK) {
+                                // TODO error
+
+                                EXT4FS_DBG("BBB: error block loading");
+
+                        }
+                        memset(new_block->data, 0, block_size);
+                        new_block->dirty = true;
+
+                        rc = block_put(new_block);
+                        if (rc != EOK) {
+                                EXT4FS_DBG("BBB: error indirect block saving");
+                        }
+
+                        ((uint32_t*)block->data)[offset_in_block] = host2uint32_t_le(new_block_addr);
+                        block->dirty = true;
+                        current_block = new_block_addr;
+                }
+
+                if (level == 1) {
+                        ((uint32_t*)block->data)[offset_in_block] = host2uint32_t_le(fblock);
+                        block->dirty = true;
                 }
 
@@ -537 +538 @@
 
                 ext4_inode_set_direct_block(inode, iblock, 0);
-                return ext4_bitmap_free_block(fs, inode_ref, fblock);
+                return ext4_balloc_free_block(fs, inode_ref, fblock);
         }
 
@@ -601 +602 @@
         }
 
-        return ext4_bitmap_free_block(fs, inode_ref, fblock);
-
-}
-
+        return ext4_balloc_free_block(fs, inode_ref, fblock);
+
+}
 
 /**