libext2fs: remove useless test and assignment in strtohashbuf()

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

diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c
index 5afdc27..32f4321 100644 (file)
--- a/lib/ext2fs/initialize.c
+++ b/lib/ext2fs/initialize.c
@@ -98,6 +98,7 @@ errcode_t ext2fs_initialize(const char *name, int flags,
        int             csum_flag;
        int             bigalloc_flag;
        int             io_flags;
+       int             has_bg;
        unsigned        reserved_inos;
        char            *buf = 0;
        char            c;
@@ -147,8 +148,7 @@ errcode_t ext2fs_initialize(const char *name, int flags,
        super->s_magic = EXT2_SUPER_MAGIC;
        super->s_state = EXT2_VALID_FS;
 
-       bigalloc_flag = EXT2_HAS_RO_COMPAT_FEATURE(param,
-                                  EXT4_FEATURE_RO_COMPAT_BIGALLOC);
+       bigalloc_flag = ext2fs_has_feature_bigalloc(param);
 
        assign_field(s_log_block_size);
 
@@ -173,6 +173,8 @@ errcode_t ext2fs_initialize(const char *name, int flags,
        set_field(s_raid_stripe_width, 0);      /* default stripe width: 0 */
        set_field(s_log_groups_per_flex, 0);
        set_field(s_flags, 0);
+       assign_field(s_backup_bgs[0]);
+       assign_field(s_backup_bgs[1]);
        if (super->s_feature_incompat & ~EXT2_LIB_FEATURE_INCOMPAT_SUPP) {
                retval = EXT2_ET_UNSUPP_FEATURE;
                goto cleanup;
@@ -256,7 +258,7 @@ errcode_t ext2fs_initialize(const char *name, int flags,
         * If we're creating an external journal device, we don't need
         * to bother with the rest.
         */
-       if (super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
+       if (ext2fs_has_feature_journal_dev(super)) {
                fs->group_desc_count = 0;
                ext2fs_mark_super_dirty(fs);
                *ret_fs = fs;
@@ -272,15 +274,16 @@ retry:
                goto cleanup;
        }
 
-       if (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-               super->s_desc_size = EXT2_MIN_DESC_SIZE_64BIT;
+       set_field(s_desc_size,
+                 ext2fs_has_feature_64bit(super) ?
+                 EXT2_MIN_DESC_SIZE_64BIT : 0);
 
        fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
                                          EXT2_DESC_PER_BLOCK(super));
 
        i = fs->blocksize >= 4096 ? 1 : 4096 / fs->blocksize;
 
-       if (super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT &&
+       if (ext2fs_has_feature_64bit(super) &&
            (ext2fs_blocks_count(super) / i) > (1ULL << 32))
                set_field(s_inodes_count, ~0U);
        else
@@ -359,7 +362,7 @@ ipg_retry:
        /*
         * check the number of reserved group descriptor table blocks
         */
-       if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
+       if (ext2fs_has_feature_resize_inode(super))
                rsv_gdt = calc_reserved_gdt_blocks(fs);
        else
                rsv_gdt = 0;
@@ -376,7 +379,17 @@ ipg_retry:
         * table, and the reserved gdt blocks.
         */
        overhead = (int) (3 + fs->inode_blocks_per_group +
-                         fs->desc_blocks + super->s_reserved_gdt_blocks);
+                         super->s_reserved_gdt_blocks);
+
+       /* Enable meta_bg if we'd lose more than 3/4 of a BG to GDT blocks. */
+       if (super->s_reserved_gdt_blocks + fs->desc_blocks >
+           super->s_blocks_per_group * 3 / 4)
+               ext2fs_set_feature_meta_bg(fs->super);
+
+       if (ext2fs_has_feature_meta_bg(fs->super))
+               overhead++;
+       else
+               overhead += fs->desc_blocks;
 
        /* This can only happen if the user requested too many inodes */
        if (overhead > super->s_blocks_per_group) {
@@ -392,7 +405,19 @@ ipg_retry:
         * backup.
         */
        overhead = (int) (2 + fs->inode_blocks_per_group);
-       if (ext2fs_bg_has_super(fs, fs->group_desc_count - 1))
+       has_bg = 0;
+       if (ext2fs_has_feature_sparse_super2(super)) {
+               /*
+                * We have to do this manually since
+                * super->s_backup_bgs hasn't been set up yet.
+                */
+               if (fs->group_desc_count == 2)
+                       has_bg = param->s_backup_bgs[0] != 0;
+               else
+                       has_bg = param->s_backup_bgs[1] != 0;
+       } else
+               has_bg = ext2fs_bg_has_super(fs, fs->group_desc_count - 1);
+       if (has_bg)
                overhead += 1 + fs->desc_blocks + super->s_reserved_gdt_blocks;
        rem = ((ext2fs_blocks_count(super) - super->s_first_data_block) %
               super->s_blocks_per_group);
@@ -421,6 +446,21 @@ ipg_retry:
         * count.
         */
 
+       /* Set up the locations of the backup superblocks */
+       if (ext2fs_has_feature_sparse_super2(super)) {
+               if (super->s_backup_bgs[0] >= fs->group_desc_count)
+                       super->s_backup_bgs[0] = fs->group_desc_count - 1;
+               if (super->s_backup_bgs[1] >= fs->group_desc_count)
+                       super->s_backup_bgs[1] = fs->group_desc_count - 1;
+               if (super->s_backup_bgs[0] == super->s_backup_bgs[1])
+                       super->s_backup_bgs[1] = 0;
+               if (super->s_backup_bgs[0] > super->s_backup_bgs[1]) {
+                       __u32 t = super->s_backup_bgs[0];
+                       super->s_backup_bgs[0] = super->s_backup_bgs[1];
+                       super->s_backup_bgs[1] = t;
+               }
+       }
+
        retval = ext2fs_get_mem(strlen(fs->device_name) + 80, &buf);
        if (retval)
                goto cleanup;
@@ -458,8 +498,7 @@ ipg_retry:
         * bitmaps will be accounted for when allocated).
         */
        free_blocks = 0;
-       csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-                                              EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
+       csum_flag = ext2fs_has_group_desc_csum(fs);
        reserved_inos = super->s_first_ino;
        for (i = 0; i < fs->group_desc_count; i++) {
                /*