@@ -218,6 +218,7 @@ int ext4_setup_system_zone(struct super_block *sb)
struct ext4_group_desc *gdp;
ext4_group_t i;
int flex_size = ext4_flex_bg_size(sbi);
+ int gd_blks;
int ret;
system_blks = kzalloc(sizeof(*system_blks), GFP_KERNEL);
@@ -226,13 +227,16 @@ int ext4_setup_system_zone(struct super_block *sb)
for (i=0; i < ngroups; i++) {
cond_resched();
- if (ext4_bg_has_super(sb, i) &&
- ((i < 5) || ((i % flex_size) == 0))) {
- ret = add_system_zone(system_blks,
- ext4_group_first_block_no(sb, i),
- ext4_bg_num_gdb(sb, i) + 1, 0);
- if (ret)
- goto err;
+ if ((i < 5) || ((i % flex_size) == 0)) {
+ gd_blks = ext4_bg_has_super(sb, i) +
+ ext4_bg_num_gdb(sb, i);
+ if (gd_blks) {
+ ret = add_system_zone(system_blks,
+ ext4_group_first_block_no(sb, i),
+ gd_blks, 0);
+ if (ret)
+ goto err;
+ }
}
gdp = ext4_get_group_desc(sb, i, NULL);
ret = add_system_zone(system_blks,