aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nilfs2/inode.c')
-rw-r--r--fs/nilfs2/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 7a3dbe4f229..d5625be236a 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -295,7 +295,7 @@ const struct address_space_operations nilfs_aops = {
295struct inode *nilfs_new_inode(struct inode *dir, int mode) 295struct inode *nilfs_new_inode(struct inode *dir, int mode)
296{ 296{
297 struct super_block *sb = dir->i_sb; 297 struct super_block *sb = dir->i_sb;
298 struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs; 298 struct the_nilfs *nilfs = sb->s_fs_info;
299 struct inode *inode; 299 struct inode *inode;
300 struct nilfs_inode_info *ii; 300 struct nilfs_inode_info *ii;
301 struct nilfs_root *root; 301 struct nilfs_root *root;
@@ -433,7 +433,7 @@ static int __nilfs_read_inode(struct super_block *sb,
433 struct nilfs_root *root, unsigned long ino, 433 struct nilfs_root *root, unsigned long ino,
434 struct inode *inode) 434 struct inode *inode)
435{ 435{
436 struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs; 436 struct the_nilfs *nilfs = sb->s_fs_info;
437 struct buffer_head *bh; 437 struct buffer_head *bh;
438 struct nilfs_inode *raw_inode; 438 struct nilfs_inode *raw_inode;
439 int err; 439 int err;
@@ -807,7 +807,7 @@ int nilfs_permission(struct inode *inode, int mask, unsigned int flags)
807 807
808int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh) 808int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)
809{ 809{
810 struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs; 810 struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
811 struct nilfs_inode_info *ii = NILFS_I(inode); 811 struct nilfs_inode_info *ii = NILFS_I(inode);
812 int err; 812 int err;
813 813
@@ -836,7 +836,7 @@ int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh)
836int nilfs_inode_dirty(struct inode *inode) 836int nilfs_inode_dirty(struct inode *inode)
837{ 837{
838 struct nilfs_inode_info *ii = NILFS_I(inode); 838 struct nilfs_inode_info *ii = NILFS_I(inode);
839 struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs; 839 struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
840 int ret = 0; 840 int ret = 0;
841 841
842 if (!list_empty(&ii->i_dirty)) { 842 if (!list_empty(&ii->i_dirty)) {
@@ -851,7 +851,7 @@ int nilfs_inode_dirty(struct inode *inode)
851int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty) 851int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty)
852{ 852{
853 struct nilfs_inode_info *ii = NILFS_I(inode); 853 struct nilfs_inode_info *ii = NILFS_I(inode);
854 struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs; 854 struct the_nilfs *nilfs = inode->i_sb->s_fs_info;
855 855
856 atomic_add(nr_dirty, &nilfs->ns_ndirtyblks); 856 atomic_add(nr_dirty, &nilfs->ns_ndirtyblks);
857 857