From: Colin Cross <ccross@android.com>
Date: Sun, 1 May 2011 02:08:09 +0000 (-0700)
Subject: Merge "Make inodes per group a multiple of inodes per block"
X-Git-Tag: android-x86-4.4-r1~229
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=06c35f935a7adadceb9ee326b3231f952f6ad203;hp=480a3b1c6d5413e06775a9d53cb1596535fd91ae;p=android-x86%2Fsystem-extras.git

Merge "Make inodes per group a multiple of inodes per block"
---

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index c9fd9925..22c94244 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -214,7 +214,8 @@ static u32 compute_inodes_per_group()
 {
 	u32 blocks = DIV_ROUND_UP(info.len, info.block_size);
 	u32 block_groups = DIV_ROUND_UP(blocks, info.blocks_per_group);
-	return DIV_ROUND_UP(info.inodes, block_groups);
+	u32 inodes = DIV_ROUND_UP(info.inodes, block_groups);
+	return ALIGN(inodes, (info.block_size / info.inode_size));
 }
 
 static u32 compute_bg_desc_reserve_blocks()