From 76c60541eadc508782bd92080de77859acf9b48b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 23 Nov 2009 07:24:38 -0500 Subject: [PATCH] --- yaml --- r: 174375 b: refs/heads/master c: 8dadb198cb70ef811916668fe67eeec82e8858dd h: refs/heads/master i: 174373: 72fe668abb4a3949e36644f86c12a025825c2e58 174371: 0f633be76ab1768c091956d9e43a46872ec9541e 174367: 4b6b959a72be196b1357e2a6e224dfc5da172f66 v: v3 --- [refs] | 2 +- trunk/fs/ext4/balloc.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0f8c81df690..672f23b7f914 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8fb9490efbd300887470a2a880a64e04dcc3f5 +refs/heads/master: 8dadb198cb70ef811916668fe67eeec82e8858dd diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c index 1d0418980f8d..f3032c919a22 100644 --- a/trunk/fs/ext4/balloc.c +++ b/trunk/fs/ext4/balloc.c @@ -761,7 +761,13 @@ static unsigned long ext4_bg_num_gdb_meta(struct super_block *sb, static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb, ext4_group_t group) { - return ext4_bg_has_super(sb, group) ? EXT4_SB(sb)->s_gdb_count : 0; + if (!ext4_bg_has_super(sb, group)) + return 0; + + if (EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG)) + return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg); + else + return EXT4_SB(sb)->s_gdb_count; } /**