From ad7353b6629dfd0505cf0e6744d4fca7f0d6573f Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 16 Aug 2012 11:59:04 -0400 Subject: [PATCH] --- yaml --- r: 321693 b: refs/heads/master c: 0548bbb85337e532ca2ed697c3e9b227ff2ed4b4 h: refs/heads/master i: 321691: 187de7817275bee29dacb605d67deccd1d1a26bd v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 80673cd9e3e8..dc3dd9149ce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a4c5de27efa4c2ecca87af0a3deea63446367e2 +refs/heads/master: 0548bbb85337e532ca2ed697c3e9b227ff2ed4b4 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 56bcaec9149c..598498904035 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -3120,6 +3120,10 @@ static int count_overhead(struct super_block *sb, ext4_group_t grp, ext4_group_t i, ngroups = ext4_get_groups_count(sb); int s, j, count = 0; + if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + return (ext4_bg_has_super(sb, grp) + ext4_bg_num_gdb(sb, grp) + + sbi->s_itb_per_group + 2); + first_block = le32_to_cpu(sbi->s_es->s_first_data_block) + (grp * EXT4_BLOCKS_PER_GROUP(sb)); last_block = first_block + EXT4_BLOCKS_PER_GROUP(sb) - 1;