Changeset 5cc1853 in mainline

Timestamp:

2015-04-26T21:26:25Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

24df0de6

Parents:

418f21d

Message:

libext4: ext4_balloc_get_first_data_block_in_group() should return an absolute block address, not relative to the block group it belongs to.

File:

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

uspace/lib/ext4/libext4_balloc.c

@@ -259 +259 @@
             sb);
 
-        r = ext4_filesystem_bg_get_backup_blocks(bg_ref);
-
-        if (ext4_filesystem_blockaddr2group(sb, bbmap) == bg_ref->index)
-                bbmap = ext4_filesystem_blockaddr2_index_in_group(sb, bbmap);
-        else
+        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 = ext4_filesystem_blockaddr2_index_in_group(sb, ibmap);
-        else
+        if (ext4_filesystem_blockaddr2group(sb, ibmap) != bg_ref->index)
                 ibmap = -1;
 
         while (1) {
-                uint64_t r_abs = ext4_filesystem_index_in_group2blockaddr(sb,
-                        r, bg_ref->index);
-
                 if (r == bbmap || r == ibmap)
                         r++;
-                else if (r_abs >= itable && r_abs < itable_sz) {
-                        r = ext4_filesystem_blockaddr2_index_in_group(sb,
-                            itable + itable_sz);
-                } else
+                else if (r >= itable && r < (itable + itable_sz))
+                        r = itable + itable_sz;
+                else
                         break;
         }