Changeset be912f53 in mainline

Timestamp:

2018-12-12T18:11:14Z (6 years ago)

Author:

Maurizio Lombardi <mlombard@…>

Children:

6915335

Parents:

4f38ad77

git-author:

Maurizio Lombardi <mlombard@…> (2018-12-12 17:22:45)

git-committer:

Maurizio Lombardi <mlombard@…> (2018-12-12 18:11:14)

Message:

libext4: simplify ext4_balloc_get_first_data_block_in_group()

The first data block is ALWAYS after the inode table, FLEX_BG doesn't
change that.

File:

• uspace/lib/ext4/src/balloc.c (modified) (1 diff)

uspace/lib/ext4/src/balloc.c

@@ -255 +255 @@
             bg_ref->index);
 
-        if (!ext4_superblock_has_feature_incompatible(sb,
-            EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
-                /*
-                 * If we are not using FLEX_BG, the first data block
-                 * is always after the inode table.
-                 */
-                r = itable + itable_sz;
-                return ext4_filesystem_blockaddr2_index_in_group(sb, r);
-        }
-
-        uint64_t bbmap = ext4_block_group_get_block_bitmap(bg_ref->block_group,
-            sb);
-        uint64_t ibmap = ext4_block_group_get_inode_bitmap(bg_ref->block_group,
-            sb);
-
-        r = ext4_filesystem_index_in_group2blockaddr(sb, 0, bg_ref->index);
-        r += ext4_filesystem_bg_get_backup_blocks(bg_ref);
-
-        if (ext4_filesystem_blockaddr2group(sb, bbmap) != bg_ref->index)
-                bbmap = -1; /* Invalid */
-
-        if (ext4_filesystem_blockaddr2group(sb, ibmap) != bg_ref->index)
-                ibmap = -1;
-
-        while (true) {
-                if (r == bbmap || r == ibmap)
-                        r++;
-                else if (r >= itable && r < (itable + itable_sz))
-                        r = itable + itable_sz;
-                else
-                        break;
-        }
-
-        return r;
+        r = itable + itable_sz;
+        return ext4_filesystem_blockaddr2_index_in_group(sb, r);
 }