Changeset b73530a in mainline for uspace/lib/ext4/libext4_extent.c

Timestamp:

2012-04-08T14:01:49Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

82cb6768

Parents:

936132f

Message:

appending fblock to existing extent

• actually not solved situation, when extent is full !!!

File:

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

uspace/lib/ext4/libext4_extent.c

@@ -223 +223 @@
         int rc;
 
+        uint64_t inode_size = ext4_inode_get_size(
+                        inode_ref->fs->superblock, inode_ref->inode);
+
+        uint32_t block_size = ext4_superblock_get_block_size(
+                        inode_ref->fs->superblock);
+
+        uint32_t last_idx = (inode_size - 1) / block_size;
+
+        if (iblock > last_idx) {
+                *fblock = 0;
+                return EOK;
+        }
+
         block_t* block = NULL;
 
@@ -549 +562 @@
         ext4_superblock_t *sb = inode_ref->fs->superblock;
         uint64_t inode_size = ext4_inode_get_size(sb, inode_ref->inode);
-
         uint32_t block_size = ext4_superblock_get_block_size(sb);
-        uint32_t new_block_idx = inode_size / block_size;
+
+        uint32_t new_block_idx = 0;
+        if (inode_size > 0) {
+                if ((inode_size % block_size) != 0) {
+                        inode_size += block_size - (inode_size % block_size);
+                }
+                new_block_idx = inode_size / block_size;
+        }
 
         ext4_extent_path_t *path;
@@ -565 +584 @@
         }
 
-        // if extent == NULL -> add extent to leaf
+        // if extent == NULL -> add extent to empty leaf
         if (path_ptr->extent == NULL) {
+
+                EXT4FS_DBG("NULL extent");
+
                 ext4_extent_t *ext = EXT4_EXTENT_FIRST(path_ptr->header);
                 ext4_extent_set_block_count(ext, 0);
@@ -579 +601 @@
         if (ext4_extent_get_block_count(path_ptr->extent) == 0) {
 
+                EXT4FS_DBG("no blocks in extent");
+
                 // Add first block to the extent
 
                 rc = ext4_balloc_alloc_block(inode_ref, &phys_block);
                 if (rc != EOK) {
+                        EXT4FS_DBG("error in allocation");
                         goto finish;
                 }
@@ -588 +613 @@
                 ext4_extent_set_block_count(path_ptr->extent, 1);
                 ext4_extent_set_start(path_ptr->extent, phys_block);
+                ext4_extent_set_first_block(path_ptr->extent, new_block_idx);
 
                 path_ptr->block->dirty = true;
@@ -594 +620 @@
 
         } else {
-                // try allocate scceeding extent block
-
+                // try allocate succeeding extent block
+
+                EXT4FS_DBG("existing extent");
+
+                uint16_t blocks = ext4_extent_get_block_count(path_ptr->extent);
+
+                if (blocks < (1 << 15)) {
+                        // there is place for more blocks
+
+                        EXT4FS_DBG("appending block to existing extent");
+
+                        uint64_t last = ext4_extent_get_start(path_ptr->extent) + blocks - 1;
+
+                        rc = ext4_balloc_try_alloc_block(inode_ref, last + 1);
+                        if (rc == EOK) {
+                                path_ptr->block->dirty = true;
+                                ext4_extent_set_block_count(path_ptr->extent, blocks + 1);
+                                phys_block = last + 1;
+                                goto finish;
+                        }
+
+                        if (rc != EINVAL) {
+                                goto finish;
+                        }
+                }
+
+                // Add new extent
                 // TODO
                 assert(false);
-
         }