diff --git a/[refs] b/[refs]
index 685e0c59033e..63a71cedfd26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5fb09fa3392ad43fbcfc2f4580752f383ab5996
+refs/heads/master: 607eb266aea9dd2abe515985e12c5cd8b32546e8
diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c
index f2702cda9779..681dea8f9532 100644
--- a/trunk/fs/ext2/super.c
+++ b/trunk/fs/ext2/super.c
@@ -775,7 +775,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 	if (EXT2_INODE_SIZE(sb) == 0)
 		goto cantfind_ext2;
 	sbi->s_inodes_per_block = sb->s_blocksize / EXT2_INODE_SIZE(sb);
-	if (sbi->s_inodes_per_block == 0)
+	if (sbi->s_inodes_per_block == 0 || sbi->s_inodes_per_group == 0)
 		goto cantfind_ext2;
 	sbi->s_itb_per_group = sbi->s_inodes_per_group /
 					sbi->s_inodes_per_block;