Changeset fe27eb4 in mainline for uspace/lib/ext4/libext4_balloc.c

Timestamp:

2011-11-20T12:07:50Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

343ccfd

Parents:

ae3d4f8

Message:

added many getters and setters

File:

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

uspace/lib/ext4/libext4_balloc.c

@@ -96 +96 @@
         }
 
-        uint32_t bitmap_block_addr = ext4_block_group_get_block_bitmap(bg_ref->block_group);
+        uint32_t bitmap_block_addr = ext4_block_group_get_block_bitmap(
+                        bg_ref->block_group, fs->superblock);
         block_t *bitmap_block;
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
@@ -129 +130 @@
 
         // Update block group free blocks count
-        uint32_t free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
+        uint32_t free_blocks = ext4_block_group_get_free_blocks_count(
+                        bg_ref->block_group, fs->superblock);
         free_blocks++;
-        ext4_block_group_set_free_blocks_count(bg_ref->block_group, free_blocks);
+        ext4_block_group_set_free_blocks_count(bg_ref->block_group,
+                        fs->superblock, free_blocks);
         bg_ref->dirty = true;
 
@@ -148 +151 @@
 {
         uint32_t block_group_count = ext4_superblock_get_block_group_count(sb);
-        uint32_t inode_table_first_block = ext4_block_group_get_inode_table_first_block(bg);
+        uint32_t inode_table_first_block = ext4_block_group_get_inode_table_first_block(
+                        bg, sb);
         uint16_t inode_table_item_size = ext4_superblock_get_inode_size(sb);
         uint32_t inodes_per_group = ext4_superblock_get_inodes_per_group(sb);
@@ -210 +214 @@
 
         uint32_t block_group_count = ext4_superblock_get_block_group_count(fs->superblock);
-        uint32_t inode_table_first_block = ext4_block_group_get_inode_table_first_block(bg_ref->block_group);
+        uint32_t inode_table_first_block = ext4_block_group_get_inode_table_first_block(
+                        bg_ref->block_group, fs->superblock);
         uint16_t inode_table_item_size = ext4_superblock_get_inode_size(fs->superblock);
         uint32_t inode_table_bytes;
@@ -278 +283 @@
 
         // Load bitmap
-        bitmap_block_addr = ext4_block_group_get_block_bitmap(bg_ref->block_group);
+        bitmap_block_addr = ext4_block_group_get_block_bitmap(bg_ref->block_group,
+                        fs->superblock);
 
         rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
@@ -380 +386 @@
 
                 // Load bitmap
-                bitmap_block_addr = ext4_block_group_get_block_bitmap(bg_ref->block_group);
+                bitmap_block_addr = ext4_block_group_get_block_bitmap(
+                                bg_ref->block_group, fs->superblock);
 
                 rc = block_get(&bitmap_block, fs->device, bitmap_block_addr, 0);
@@ -461 +468 @@
 
         // Update block group free blocks count
-        uint32_t bg_free_blocks = ext4_block_group_get_free_blocks_count(bg_ref->block_group);
+        uint32_t bg_free_blocks = ext4_block_group_get_free_blocks_count(
+                        bg_ref->block_group, fs->superblock);
         bg_free_blocks--;
-        ext4_block_group_set_free_blocks_count(bg_ref->block_group, bg_free_blocks);
+        ext4_block_group_set_free_blocks_count(bg_ref->block_group,
+                        fs->superblock, bg_free_blocks);
         bg_ref->dirty = true;