Update ext4 encryption format to final v4.1 version

[tools/e2fsprogs.git] / lib / ext2fs / alloc_tables.c

diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c
index 474a61a..3e1952f 100644 (file)
--- a/lib/ext2fs/alloc_tables.c
+++ b/lib/ext2fs/alloc_tables.c
@@ -47,16 +47,17 @@ static blk64_t flexbg_offset(ext2_filsys fs, dgrp_t group, blk64_t start_blk,
        flexbg = group / flexbg_size;
        size = rem_grp * elem_size;
 
-       if (size > (int) (fs->super->s_blocks_per_group / 8))
-               size = (int) fs->super->s_blocks_per_group / 8;
+       if (size > (int) (fs->super->s_blocks_per_group / 4))
+               size = (int) fs->super->s_blocks_per_group / 4;
 
        /*
-        * Don't do a long search if the previous block
-        * search is still valid.
+        * Don't do a long search if the previous block search is still valid,
+        * but skip minor obstructions such as group descriptor backups.
         */
-       if (start_blk && ext2fs_test_block_bitmap_range2(bmap, start_blk,
-                                                        elem_size))
-               return start_blk;
+       if (start_blk && start_blk < ext2fs_blocks_count(fs->super) &&
+           ext2fs_get_free_blocks2(fs, start_blk, start_blk + size, elem_size,
+                                   bmap, &first_free) == 0)
+               return first_free;
 
        start_blk = ext2fs_group_first_block2(fs, flexbg_size * flexbg);
        last_grp = group | (flexbg_size - 1);
@@ -86,7 +87,7 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
        errcode_t       retval;
        blk64_t         group_blk, start_blk, last_blk, new_blk;
        dgrp_t          last_grp = 0;
-       int             rem_grps = 0, flexbg_size = 0;
+       int             rem_grps = 0, flexbg_size = 0, table_offset = 0;
 
        group_blk = ext2fs_group_first_block2(fs, group);
        last_blk = ext2fs_group_last_block2(fs, group);
@@ -123,8 +124,22 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
        if (flexbg_size) {
                blk64_t prev_block = 0;
 
+               table_offset = flexbg_size;
                if (group % flexbg_size)
                        prev_block = ext2fs_block_bitmap_loc(fs, group - 1) + 1;
+               else if (last_grp == fs->group_desc_count-1) {
+                       /*
+                        * If we are allocating for the last flex_bg
+                        * keep the metadata tables contiguous
+                        */
+                       table_offset = last_grp & (flexbg_size - 1);
+                       if (table_offset == 0)
+                               table_offset = flexbg_size;
+                       else
+                               table_offset++;
+               }
+               /* FIXME: Take backup group descriptor blocks into account
+                * if the flexbg allocations will grow to overlap them... */
                start_blk = flexbg_offset(fs, group, prev_block, bmap,
                                          rem_grps, 1);
                last_blk = ext2fs_group_last_block2(fs, last_grp);
@@ -155,7 +170,9 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
                        prev_block = ext2fs_inode_bitmap_loc(fs, group - 1) + 1;
                else
                        prev_block = ext2fs_block_bitmap_loc(fs, group) +
-                               flexbg_size;
+                               table_offset;
+               /* FIXME: Take backup group descriptor blocks into account
+                * if the flexbg allocations will grow to overlap them... */
                start_blk = flexbg_offset(fs, group, prev_block, bmap,
                                          rem_grps, 1);
                last_blk = ext2fs_group_last_block2(fs, last_grp);
@@ -191,8 +208,10 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
                                fs->inode_blocks_per_group;
                else
                        prev_block = ext2fs_inode_bitmap_loc(fs, group) +
-                               flexbg_size;
+                               table_offset;
 
+               /* FIXME: Take backup group descriptor blocks into account
+                * if the flexbg allocations will grow to overlap them... */
                group_blk = flexbg_offset(fs, group, prev_block, bmap,
                                          rem_grps, fs->inode_blocks_per_group);
                last_blk = ext2fs_group_last_block2(fs, last_grp);