diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /fs/ext4/super.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 8031dc0e24..1ca0f546c4 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -1797,7 +1797,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
| 1797 | sbi->s_desc_size = EXT4_MIN_DESC_SIZE; | 1797 | sbi->s_desc_size = EXT4_MIN_DESC_SIZE; |
| 1798 | sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); | 1798 | sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); |
| 1799 | sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); | 1799 | sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); |
| 1800 | if (EXT4_INODE_SIZE(sb) == 0) | 1800 | if (EXT4_INODE_SIZE(sb) == 0 || EXT4_INODES_PER_GROUP(sb) == 0) |
| 1801 | goto cantfind_ext4; | 1801 | goto cantfind_ext4; |
| 1802 | sbi->s_inodes_per_block = blocksize / EXT4_INODE_SIZE(sb); | 1802 | sbi->s_inodes_per_block = blocksize / EXT4_INODE_SIZE(sb); |
| 1803 | if (sbi->s_inodes_per_block == 0) | 1803 | if (sbi->s_inodes_per_block == 0) |