From 67a2941d756ed8965685c266a7ede8b6f22c5206 Mon Sep 17 00:00:00 2001 From: "Andries E. Brouwer" Date: Mon, 17 Dec 2007 16:19:55 -0800 Subject: [PATCH] --- yaml --- r: 74975 b: refs/heads/master c: b47b6f38e5202c924bfe7632dce5dda4e3d40731 h: refs/heads/master i: 74973: e4a9da76fc26ba251b9aa12e0a2502e55971623c 74971: c896babf66f539bf77d4dd6ee61e814739994a1e 74967: 944fadbe45e2cf4a7a2db9a27035f52148a07fc3 74959: af27bccce2236eb8ce1387abfa90541d7a6a293c 74943: cc940c6672b38121df407143c4111486ffa83a58 v: v3 --- [refs] | 2 +- trunk/fs/ext3/super.c | 2 +- trunk/fs/ext4/super.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87eeffb676d0..9656b2be2695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e2de407bec98fb07040f658f55fb71ba1b594f5 +refs/heads/master: b47b6f38e5202c924bfe7632dce5dda4e3d40731 diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index de55da9e28ba..cb14de1502c3 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -1676,7 +1676,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); sbi->s_frags_per_group = le32_to_cpu(es->s_frags_per_group); sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); - if (EXT3_INODE_SIZE(sb) == 0) + if (EXT3_INODE_SIZE(sb) == 0 || EXT3_INODES_PER_GROUP(sb) == 0) goto cantfind_ext3; sbi->s_inodes_per_block = blocksize / EXT3_INODE_SIZE(sb); if (sbi->s_inodes_per_block == 0) diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 8031dc0e24e5..1ca0f546c466 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -1797,7 +1797,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) sbi->s_desc_size = EXT4_MIN_DESC_SIZE; sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); - if (EXT4_INODE_SIZE(sb) == 0) + if (EXT4_INODE_SIZE(sb) == 0 || EXT4_INODES_PER_GROUP(sb) == 0) goto cantfind_ext4; sbi->s_inodes_per_block = blocksize / EXT4_INODE_SIZE(sb); if (sbi->s_inodes_per_block == 0)