libext2fs: make sure ismounted.c explicitly pulls in <sys/types.h>

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

diff --git a/lib/ext2fs/alloc_sb.c b/lib/ext2fs/alloc_sb.c
index 2e32389..8788c00 100644 (file)
--- a/lib/ext2fs/alloc_sb.c
+++ b/lib/ext2fs/alloc_sb.c
@@ -10,6 +10,7 @@
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -46,7 +47,7 @@ int ext2fs_reserve_super_and_bgd(ext2_filsys fs,
 {
        blk64_t super_blk, old_desc_blk, new_desc_blk;
        blk_t   used_blks;
-       int     j, old_desc_blocks, num_blocks;
+       int     old_desc_blocks, num_blocks;
 
        ext2fs_super_and_bgd_loc2(fs, group, &super_blk,
                                  &old_desc_blk, &new_desc_blk, &used_blks);
@@ -64,12 +65,11 @@ int ext2fs_reserve_super_and_bgd(ext2_filsys fs,
                ext2fs_mark_block_bitmap2(bmap, 0);
 
        if (old_desc_blk) {
-               if (fs->super->s_reserved_gdt_blocks && fs->block_map == bmap)
-                       ext2fs_bg_flags_clear(fs, group, EXT2_BG_BLOCK_UNINIT);
-               for (j=0; j < old_desc_blocks; j++)
-                       if (old_desc_blk + j < ext2fs_blocks_count(fs->super))
-                               ext2fs_mark_block_bitmap2(bmap,
-                                                        old_desc_blk + j);
+               num_blocks = old_desc_blocks;
+               if (old_desc_blk + num_blocks >= ext2fs_blocks_count(fs->super))
+                       num_blocks = ext2fs_blocks_count(fs->super) -
+                               old_desc_blk;
+               ext2fs_mark_block_bitmap_range2(bmap, old_desc_blk, num_blocks);
        }
        if (new_desc_blk)
                ext2fs_mark_block_bitmap2(bmap, new_desc_blk);