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 e061e66c8280..386ba41fa17b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1568,7 +1568,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, | |||
1568 | return -1; | 1568 | return -1; |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | journal_inode = path.dentry->d_inode; | 1571 | journal_inode = d_inode(path.dentry); |
1572 | if (!S_ISBLK(journal_inode->i_mode)) { | 1572 | if (!S_ISBLK(journal_inode->i_mode)) { |
1573 | ext4_msg(sb, KERN_ERR, "error: journal path %s " | 1573 | ext4_msg(sb, KERN_ERR, "error: journal path %s " |
1574 | "is not a block device", journal_path); | 1574 | "is not a block device", journal_path); |
@@ -5199,7 +5199,7 @@ static int ext4_write_info(struct super_block *sb, int type) | |||
5199 | handle_t *handle; | 5199 | handle_t *handle; |
5200 | 5200 | ||
5201 | /* Data block + inode block */ | 5201 | /* Data block + inode block */ |
5202 | handle = ext4_journal_start(sb->s_root->d_inode, EXT4_HT_QUOTA, 2); | 5202 | handle = ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2); |
5203 | if (IS_ERR(handle)) | 5203 | if (IS_ERR(handle)) |
5204 | return PTR_ERR(handle); | 5204 | return PTR_ERR(handle); |
5205 | ret = dquot_commit_info(sb, type); | 5205 | ret = dquot_commit_info(sb, type); |
@@ -5247,7 +5247,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, | |||
5247 | * all updates to the file when we bypass pagecache... | 5247 | * all updates to the file when we bypass pagecache... |
5248 | */ | 5248 | */ |
5249 | if (EXT4_SB(sb)->s_journal && | 5249 | if (EXT4_SB(sb)->s_journal && |
5250 | ext4_should_journal_data(path->dentry->d_inode)) { | 5250 | ext4_should_journal_data(d_inode(path->dentry))) { |
5251 | /* | 5251 | /* |
5252 | * We don't need to lock updates but journal_flush() could | 5252 | * We don't need to lock updates but journal_flush() could |
5253 | * otherwise be livelocked... | 5253 | * otherwise be livelocked... |