Changeset 1e65444 in mainline for uspace/lib/ext4/libext4_bitmap.c

Timestamp:

2011-11-09T17:52:33Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2b9e142

Parents:

35f48f2

Message:

more functional file writing - indirect blocks too

File:

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

uspace/lib/ext4/libext4_bitmap.c

@@ -43 +43 @@
 static void ext4_bitmap_free_bit(uint8_t *bitmap, uint32_t index)
 {
+        // Block numbers are 1-based
         uint32_t byte_index = index / 8;
         uint32_t bit_index = index % 8;
+
+//      EXT4FS_DBG("freeing block \%u, byte \%u and bit \%u", index, byte_index, bit_index);
 
         uint8_t *target = bitmap + byte_index;
@@ -59 +62 @@
         int i;
         uint32_t idx = 0;
+        uint8_t value, new_value;
 
         while (pos < bitmap + size) {
@@ -72 +76 @@
         if (pos < bitmap + size) {
 
+//              EXT4FS_DBG("byte found \%u", (uint32_t)(pos - bitmap));
+
                 for(i = 0; i < 8; ++i) {
-                        if ((*pos & (1 << i)) == 0) {
+                        value = *pos;
+
+                        if ((value & (1 << i)) == 0) {
                                 // free bit found
-                                *pos |= (1 << i);
-                                *index = idx;
+//                              EXT4FS_DBG("bit found \%u", i);
+                                new_value = value | (1 << i);
+                                *pos = new_value;
+                                *index = idx + i;
                                 return EOK;
                         }
-
-                        idx++;
                 }
         }
@@ -98 +106 @@
 
         blocks_per_group = ext4_superblock_get_blocks_per_group(fs->superblock);
-        block_group = block_index / blocks_per_group;
-        index_in_group = block_index % blocks_per_group;
+        block_group = ((block_index - 1) / blocks_per_group);
+        index_in_group = (block_index - 1) % blocks_per_group;
 
         rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
@@ -133 +141 @@
                 return rc;
         }
+
+        EXT4FS_DBG("block \%u released", block_index);
 
         return EOK;
@@ -148 +158 @@
 
         inodes_per_group = ext4_superblock_get_inodes_per_group(fs->superblock);
-        block_group = inode_ref->index / inodes_per_group;
+        block_group = (inode_ref->index - 1) / inodes_per_group;
 
         block_size = ext4_superblock_get_block_size(fs->superblock);
@@ -166 +176 @@
 
         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
         }
+
+        block->dirty = true;
+
+        // TODO check retval
+        block_put(block);
 
         // TODO decrement superblock free blocks count
@@ -179 +192 @@
 
         uint32_t bg_free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
-        bg_free_blocks++;
+        bg_free_blocks--;
         ext4_block_group_set_free_blocks_count(bg_ref->block_group, bg_free_blocks);
         bg_ref->dirty = true;
 
-        // return
+        ext4_filesystem_put_block_group_ref(bg_ref);
+
         blocks_per_group = ext4_superblock_get_blocks_per_group(fs->superblock);
-        *fblock = blocks_per_group * block_group + rel_block_idx;
+
+        EXT4FS_DBG("block \%u allocated", blocks_per_group * block_group + rel_block_idx + 1);
+
+        *fblock = blocks_per_group * block_group + rel_block_idx + 1;
         return EOK;