|
@@ -1654,7 +1654,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
|
|
* Note: s_es must be initialized as soon as possible because
|
|
* Note: s_es must be initialized as soon as possible because
|
|
* some ext3 macro-instructions depend on its value
|
|
* some ext3 macro-instructions depend on its value
|
|
*/
|
|
*/
|
|
- es = (struct ext3_super_block *) (((char *)bh->b_data) + offset);
|
|
|
|
|
|
+ es = (struct ext3_super_block *) (bh->b_data + offset);
|
|
sbi->s_es = es;
|
|
sbi->s_es = es;
|
|
sb->s_magic = le16_to_cpu(es->s_magic);
|
|
sb->s_magic = le16_to_cpu(es->s_magic);
|
|
if (sb->s_magic != EXT3_SUPER_MAGIC)
|
|
if (sb->s_magic != EXT3_SUPER_MAGIC)
|
|
@@ -1765,7 +1765,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
|
|
"error: can't read superblock on 2nd try");
|
|
"error: can't read superblock on 2nd try");
|
|
goto failed_mount;
|
|
goto failed_mount;
|
|
}
|
|
}
|
|
- es = (struct ext3_super_block *)(((char *)bh->b_data) + offset);
|
|
|
|
|
|
+ es = (struct ext3_super_block *)(bh->b_data + offset);
|
|
sbi->s_es = es;
|
|
sbi->s_es = es;
|
|
if (es->s_magic != cpu_to_le16(EXT3_SUPER_MAGIC)) {
|
|
if (es->s_magic != cpu_to_le16(EXT3_SUPER_MAGIC)) {
|
|
ext3_msg(sb, KERN_ERR,
|
|
ext3_msg(sb, KERN_ERR,
|
|
@@ -2168,7 +2168,7 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,
|
|
goto out_bdev;
|
|
goto out_bdev;
|
|
}
|
|
}
|
|
|
|
|
|
- es = (struct ext3_super_block *) (((char *)bh->b_data) + offset);
|
|
|
|
|
|
+ es = (struct ext3_super_block *) (bh->b_data + offset);
|
|
if ((le16_to_cpu(es->s_magic) != EXT3_SUPER_MAGIC) ||
|
|
if ((le16_to_cpu(es->s_magic) != EXT3_SUPER_MAGIC) ||
|
|
!(le32_to_cpu(es->s_feature_incompat) &
|
|
!(le32_to_cpu(es->s_feature_incompat) &
|
|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
|
|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
|