tst_libext2fs: Avoid multiple definition of global variables

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

diff --git a/lib/ext2fs/alloc_sb.c b/lib/ext2fs/alloc_sb.c
index 5bf2db7..8530b40 100644 (file)
--- a/lib/ext2fs/alloc_sb.c
+++ b/lib/ext2fs/alloc_sb.c
@@ -1,15 +1,16 @@
 /*
- * alloc_sb.c --- Allocate the superblock and block group descriptors for a 
+ * alloc_sb.c --- Allocate the superblock and block group descriptors for a
  * newly initialized filesystem.  Used by mke2fs when initializing a filesystem
  *
  * Copyright (C) 1994, 1995, 1996, 2003 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -40,31 +41,41 @@
  *
  * See also the comment for ext2fs_super_and_bgd_loc()
  */
-int ext2fs_reserve_super_and_bgd(ext2_filsys fs, 
+int ext2fs_reserve_super_and_bgd(ext2_filsys fs,
                                 dgrp_t group,
                                 ext2fs_block_bitmap bmap)
 {
-       blk_t   super_blk, old_desc_blk, new_desc_blk;
-       int     j, old_desc_blocks, num_blocks;
+       blk64_t super_blk, old_desc_blk, new_desc_blk;
+       blk_t   used_blks;
+       int     old_desc_blocks, num_blocks;
 
-       num_blocks = ext2fs_super_and_bgd_loc(fs, group, &super_blk, 
-                                             &old_desc_blk, &new_desc_blk, 0);
+       ext2fs_super_and_bgd_loc2(fs, group, &super_blk,
+                                 &old_desc_blk, &new_desc_blk, &used_blks);
 
-       if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+       if (ext2fs_has_feature_meta_bg(fs->super))
                old_desc_blocks = fs->super->s_first_meta_bg;
        else
-               old_desc_blocks = 
+               old_desc_blocks =
                        fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
 
        if (super_blk || (group == 0))
-               ext2fs_mark_block_bitmap(bmap, super_blk);
+               ext2fs_mark_block_bitmap2(bmap, super_blk);
+       if ((group == 0) && (fs->blocksize == 1024) &&
+           EXT2FS_CLUSTER_RATIO(fs) > 1)
+               ext2fs_mark_block_bitmap2(bmap, 0);
 
        if (old_desc_blk) {
-               for (j=0; j < old_desc_blocks; j++)
-                       ext2fs_mark_block_bitmap(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_bitmap(bmap, new_desc_blk);
+               ext2fs_mark_block_bitmap2(bmap, new_desc_blk);
 
-       return num_blocks;
+       num_blocks = ext2fs_group_blocks_count(fs, group);
+       num_blocks -= 2 + fs->inode_blocks_per_group + used_blks;
+
+       return num_blocks  ;
 }