diff options
Diffstat (limited to 'fs/nilfs2/super.c')
-rw-r--r-- | fs/nilfs2/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 5bc2a1cf73c3..282fb1037823 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -610,7 +610,7 @@ static int nilfs_unfreeze(struct super_block *sb) | |||
610 | static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) | 610 | static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) |
611 | { | 611 | { |
612 | struct super_block *sb = dentry->d_sb; | 612 | struct super_block *sb = dentry->d_sb; |
613 | struct nilfs_root *root = NILFS_I(dentry->d_inode)->i_root; | 613 | struct nilfs_root *root = NILFS_I(d_inode(dentry))->i_root; |
614 | struct the_nilfs *nilfs = root->nilfs; | 614 | struct the_nilfs *nilfs = root->nilfs; |
615 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); | 615 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); |
616 | unsigned long long blocks; | 616 | unsigned long long blocks; |
@@ -681,7 +681,7 @@ static int nilfs_show_options(struct seq_file *seq, struct dentry *dentry) | |||
681 | { | 681 | { |
682 | struct super_block *sb = dentry->d_sb; | 682 | struct super_block *sb = dentry->d_sb; |
683 | struct the_nilfs *nilfs = sb->s_fs_info; | 683 | struct the_nilfs *nilfs = sb->s_fs_info; |
684 | struct nilfs_root *root = NILFS_I(dentry->d_inode)->i_root; | 684 | struct nilfs_root *root = NILFS_I(d_inode(dentry))->i_root; |
685 | 685 | ||
686 | if (!nilfs_test_opt(nilfs, BARRIER)) | 686 | if (!nilfs_test_opt(nilfs, BARRIER)) |
687 | seq_puts(seq, ",nobarrier"); | 687 | seq_puts(seq, ",nobarrier"); |
@@ -1190,7 +1190,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data) | |||
1190 | 1190 | ||
1191 | sb->s_flags &= ~MS_RDONLY; | 1191 | sb->s_flags &= ~MS_RDONLY; |
1192 | 1192 | ||
1193 | root = NILFS_I(sb->s_root->d_inode)->i_root; | 1193 | root = NILFS_I(d_inode(sb->s_root))->i_root; |
1194 | err = nilfs_attach_log_writer(sb, root); | 1194 | err = nilfs_attach_log_writer(sb, root); |
1195 | if (err) | 1195 | if (err) |
1196 | goto restore_opts; | 1196 | goto restore_opts; |