Changeset 6088193 in mainline for uspace/lib/ext4/libext4_bitmap.c

Timestamp:

2011-11-10T19:59:51Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

27ca3a3

Parents:

b3d7277

Message:

bugfixes in indirect block writing

File:

• uspace/lib/ext4/libext4_bitmap.c (modified) (7 diffs)

uspace/lib/ext4/libext4_bitmap.c

@@ -95 +95 @@
 }
 
-int ext4_bitmap_free_block(ext4_filesystem_t *fs, uint32_t block_index)
+int ext4_bitmap_free_block(ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, uint32_t block_index)
 {
         int rc;
@@ -102 +102 @@
         uint32_t index_in_group;
         uint32_t bitmap_block;
+        uint32_t block_size;
         ext4_block_group_ref_t *bg_ref;
         block_t *block;
+
+        block_size = ext4_superblock_get_block_size(fs->superblock);
 
         blocks_per_group = ext4_superblock_get_blocks_per_group(fs->superblock);
@@ -128 +131 @@
                 return rc;
         }
+
+        uint64_t ino_blocks = ext4_inode_get_blocks_count(fs->superblock, inode_ref->inode);
+        ino_blocks -= block_size / EXT4_INODE_BLOCK_SIZE;
+        ext4_inode_set_blocks_count(fs->superblock, inode_ref->inode, ino_blocks);
+        inode_ref->dirty = true;
 
         uint32_t free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
@@ -138 +146 @@
         rc = ext4_filesystem_put_block_group_ref(bg_ref);
         if (rc != EOK) {
+                EXT4FS_DBG("error in saving bg_ref \%d", rc);
                 // TODO error
                 return rc;
         }
 
-        EXT4FS_DBG("block \%u released", block_index);
+//      EXT4FS_DBG("block \%u released", block_index);
 
         return EOK;
@@ -177 +186 @@
         rc = ext4_bitmap_find_free_bit_and_set(block->data, &rel_block_idx, block_size);
         if (rc != EOK) {
-                EXT4FS_DBG("no block found");
-                // TODO if ENOSPC - try next block group - try next block groups
+                EXT4FS_DBG("no free block found");
+                // TODO if ENOSPC - try next block groups
         }
 
         block->dirty = true;
 
-        // TODO check retval
-        block_put(block);
+        rc = block_put(block);
+        if (rc != EOK) {
+                // TODO error
+                EXT4FS_DBG("error in saving bitmap \%d", rc);
+        }
 
         // TODO decrement superblock free blocks count
@@ -191 +203 @@
         //ext4_superblock_set_free_blocks_count(sb, sb_free_blocks);
 
+        uint64_t ino_blocks = ext4_inode_get_blocks_count(fs->superblock, inode_ref->inode);
+        ino_blocks += block_size / EXT4_INODE_BLOCK_SIZE;
+        ext4_inode_set_blocks_count(fs->superblock, inode_ref->inode, ino_blocks);
+        inode_ref->dirty = true;
+
         uint32_t bg_free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
         bg_free_blocks--;
@@ -200 +217 @@
         blocks_per_group = ext4_superblock_get_blocks_per_group(fs->superblock);
 
-        EXT4FS_DBG("block \%u allocated", blocks_per_group * block_group + rel_block_idx + 1);
+//      EXT4FS_DBG("block \%u allocated", blocks_per_group * block_group + rel_block_idx + 1);
 
         *fblock = blocks_per_group * block_group + rel_block_idx + 1;