Changeset 9aa82e6 in mainline

Timestamp:

2012-07-10T09:46:53Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

292c843

Parents:

5d3d75a5

Message:

simplified function header - redundant param removed

File:

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

uspace/lib/ext4/libext4_balloc.c

@@ -279 +279 @@
  */
 static uint32_t ext4_balloc_get_first_data_block_in_group(
-                ext4_superblock_t *sb, ext4_block_group_t *bg, uint32_t bgid)
+                ext4_superblock_t *sb, ext4_block_group_ref_t *bg_ref)
 {
         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, sb);
+                        bg_ref->block_group, 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);
@@ -289 +289 @@
         uint32_t inode_table_bytes;
 
-        if (bgid < block_group_count - 1) {
+        if (bg_ref->index < block_group_count - 1) {
                 inode_table_bytes = inodes_per_group * inode_table_item_size;
         } else {
@@ -428 +428 @@
         /* Compute indexes */
         uint32_t first_in_group =
-                        ext4_balloc_get_first_data_block_in_group(sb,
-                                        bg_ref->block_group, block_group);
+                        ext4_balloc_get_first_data_block_in_group(sb, bg_ref);
 
         uint32_t first_in_group_index = ext4_balloc_blockaddr2_index_in_group(
@@ -439 +438 @@
 
         /* Load block with bitmap */
-        bitmap_block_addr = ext4_block_group_get_block_bitmap(bg_ref->block_group,
-                        sb);
-
-        rc = block_get(&bitmap_block, inode_ref->fs->device, bitmap_block_addr, 0);
+        bitmap_block_addr = ext4_block_group_get_block_bitmap(
+                        bg_ref->block_group, sb);
+
+        rc = block_get(&bitmap_block, inode_ref->fs->device,
+                        bitmap_block_addr, BLOCK_FLAGS_NONE);
         if (rc != EOK) {
                 ext4_filesystem_put_block_group_ref(bg_ref);
@@ -554 +554 @@
                 /* Compute indexes */
                 first_in_group = ext4_balloc_get_first_data_block_in_group(
-                                sb, bg_ref->block_group, bgid);
+                                sb, bg_ref);
                 index_in_group = ext4_balloc_blockaddr2_index_in_group(sb,
                                                 first_in_group);