nilfs2: use iget for all metadata files

[deliverable/linux.git] / fs / nilfs2 / mdt.c

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 3bbd340a5136ae97362626488c53c4be4bee6419..44326cfe1fa9415d3fc52a1c84317ab1ca932a36 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -444,8 +444,7 @@ static const struct inode_operations def_mdt_iops;
 static const struct file_operations def_mdt_fops;
 
 
-int nilfs_mdt_init(struct inode *inode, struct the_nilfs *nilfs,
-                  gfp_t gfp_mask, size_t objsz)
+int nilfs_mdt_init(struct inode *inode, gfp_t gfp_mask, size_t objsz)
 {
        struct nilfs_mdt_info *mi;
 
@@ -453,13 +452,17 @@ int nilfs_mdt_init(struct inode *inode, struct the_nilfs *nilfs,
        if (!mi)
                return -ENOMEM;
 
-       mi->mi_nilfs = nilfs;
+       mi->mi_nilfs = NILFS_I_NILFS(inode);
        init_rwsem(&mi->mi_sem);
        inode->i_private = mi;
 
        inode->i_mode = S_IFREG;
        mapping_set_gfp_mask(inode->i_mapping, gfp_mask);
-       inode->i_mapping->backing_dev_info = nilfs->ns_bdi;
+       inode->i_mapping->backing_dev_info = inode->i_sb->s_bdi;
+
+       inode->i_op = &def_mdt_iops;
+       inode->i_fop = &def_mdt_fops;
+       inode->i_mapping->a_ops = &def_mdt_aops;
 
        return 0;
 }
@@ -544,13 +547,10 @@ struct inode *nilfs_mdt_new(struct the_nilfs *nilfs, struct super_block *sb,
        if (!inode)
                return NULL;
 
-       if (nilfs_mdt_init(inode, nilfs, NILFS_MDT_GFP, objsz) < 0) {
+       if (nilfs_mdt_init(inode, NILFS_MDT_GFP, objsz) < 0) {
                nilfs_destroy_inode(inode);
                return NULL;
        }
-       inode->i_op = &def_mdt_iops;
-       inode->i_fop = &def_mdt_fops;
-       inode->i_mapping->a_ops = &def_mdt_aops;
        return inode;
 }