diff options
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index dbc9544c7087..545932c0a290 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -3126,7 +3126,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
3126 | * Note: s_es must be initialized as soon as possible because | 3126 | * Note: s_es must be initialized as soon as possible because |
3127 | * some ext4 macro-instructions depend on its value | 3127 | * some ext4 macro-instructions depend on its value |
3128 | */ | 3128 | */ |
3129 | es = (struct ext4_super_block *) (((char *)bh->b_data) + offset); | 3129 | es = (struct ext4_super_block *) (bh->b_data + offset); |
3130 | sbi->s_es = es; | 3130 | sbi->s_es = es; |
3131 | sb->s_magic = le16_to_cpu(es->s_magic); | 3131 | sb->s_magic = le16_to_cpu(es->s_magic); |
3132 | if (sb->s_magic != EXT4_SUPER_MAGIC) | 3132 | if (sb->s_magic != EXT4_SUPER_MAGIC) |
@@ -3335,7 +3335,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
3335 | "Can't read superblock on 2nd try"); | 3335 | "Can't read superblock on 2nd try"); |
3336 | goto failed_mount; | 3336 | goto failed_mount; |
3337 | } | 3337 | } |
3338 | es = (struct ext4_super_block *)(((char *)bh->b_data) + offset); | 3338 | es = (struct ext4_super_block *)(bh->b_data + offset); |
3339 | sbi->s_es = es; | 3339 | sbi->s_es = es; |
3340 | if (es->s_magic != cpu_to_le16(EXT4_SUPER_MAGIC)) { | 3340 | if (es->s_magic != cpu_to_le16(EXT4_SUPER_MAGIC)) { |
3341 | ext4_msg(sb, KERN_ERR, | 3341 | ext4_msg(sb, KERN_ERR, |
@@ -3976,7 +3976,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, | |||
3976 | goto out_bdev; | 3976 | goto out_bdev; |
3977 | } | 3977 | } |
3978 | 3978 | ||
3979 | es = (struct ext4_super_block *) (((char *)bh->b_data) + offset); | 3979 | es = (struct ext4_super_block *) (bh->b_data + offset); |
3980 | if ((le16_to_cpu(es->s_magic) != EXT4_SUPER_MAGIC) || | 3980 | if ((le16_to_cpu(es->s_magic) != EXT4_SUPER_MAGIC) || |
3981 | !(le32_to_cpu(es->s_feature_incompat) & | 3981 | !(le32_to_cpu(es->s_feature_incompat) & |
3982 | EXT4_FEATURE_INCOMPAT_JOURNAL_DEV)) { | 3982 | EXT4_FEATURE_INCOMPAT_JOURNAL_DEV)) { |