From a6bb66bc221c4571560ceec1de1b70b27b6a1bfe Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Fri, 11 Jul 2008 19:27:31 -0400
Subject: [PATCH] --- yaml --- r: 101095 b: refs/heads/master c:
 6afd670713c9e7d5c5550e379dfedca8ffab4c90 h: refs/heads/master i:   101093:
 12f4595a9dc680dbb3b5ee452e9921b5478462b2   101091:
 85a75dd5e879f35bda31ae443a8b116dc57668d0   101087:
 0a9868021f60e7c2645d899b5483818c84a268cb v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ext4/balloc.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7424348d2c18..b1e0b2187d76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7477827f6686ce29b6216d9eb26f6b9027742dcc
+refs/heads/master: 6afd670713c9e7d5c5550e379dfedca8ffab4c90
diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c
index 6dcbec9b2562..1327ac3a04de 100644
--- a/trunk/fs/ext4/balloc.c
+++ b/trunk/fs/ext4/balloc.c
@@ -121,12 +121,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
 				le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks);
 		}
 	} else { /* For META_BG_BLOCK_GROUPS */
-		int group_rel = (block_group -
-				 le32_to_cpu(sbi->s_es->s_first_meta_bg)) %
-				EXT4_DESC_PER_BLOCK(sb);
-		if (group_rel == 0 || group_rel == 1 ||
-		    (group_rel == EXT4_DESC_PER_BLOCK(sb) - 1))
-			bit_max += 1;
+		bit_max += ext4_bg_num_gdb(sb, block_group);
 	}
 
 	if (block_group == sbi->s_groups_count - 1) {