diff --git a/[refs] b/[refs]
index 1d21d733a632..224c7a629ec1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8bbe8c401c61408ea226b33b824f231c8f9ccae
+refs/heads/master: 00d098822fe215a2f4fd32f244a9055b0b043bfe
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index f2fa5e8a582c..3424e82392ad 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4617,7 +4617,7 @@ static int __ext4_get_inode_loc(struct inode *inode,
 	/*
 	 * Figure out the offset within the block group inode table
 	 */
-	inodes_per_block = (EXT4_BLOCK_SIZE(sb) / EXT4_INODE_SIZE(sb));
+	inodes_per_block = EXT4_SB(sb)->s_inodes_per_block;
 	inode_offset = ((inode->i_ino - 1) %
 			EXT4_INODES_PER_GROUP(sb));
 	block = ext4_inode_table(sb, gdp) + (inode_offset / inodes_per_block);