aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/the_nilfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nilfs2/the_nilfs.c')
-rw-r--r--fs/nilfs2/the_nilfs.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 461b7211e14f..6a012b9e1b31 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -87,8 +87,8 @@ static struct the_nilfs *alloc_nilfs(struct block_device *bdev)
87 init_rwsem(&nilfs->ns_writer_sem); 87 init_rwsem(&nilfs->ns_writer_sem);
88 INIT_LIST_HEAD(&nilfs->ns_list); 88 INIT_LIST_HEAD(&nilfs->ns_list);
89 INIT_LIST_HEAD(&nilfs->ns_supers); 89 INIT_LIST_HEAD(&nilfs->ns_supers);
90 INIT_LIST_HEAD(&nilfs->ns_gc_inodes);
90 spin_lock_init(&nilfs->ns_last_segment_lock); 91 spin_lock_init(&nilfs->ns_last_segment_lock);
91 nilfs->ns_gc_inodes_h = NULL;
92 init_rwsem(&nilfs->ns_segctor_sem); 92 init_rwsem(&nilfs->ns_segctor_sem);
93 93
94 return nilfs; 94 return nilfs;
@@ -164,7 +164,6 @@ void put_nilfs(struct the_nilfs *nilfs)
164 nilfs_mdt_destroy(nilfs->ns_gc_dat); 164 nilfs_mdt_destroy(nilfs->ns_gc_dat);
165 } 165 }
166 if (nilfs_init(nilfs)) { 166 if (nilfs_init(nilfs)) {
167 nilfs_destroy_gccache(nilfs);
168 brelse(nilfs->ns_sbh[0]); 167 brelse(nilfs->ns_sbh[0]);
169 brelse(nilfs->ns_sbh[1]); 168 brelse(nilfs->ns_sbh[1]);
170 } 169 }
@@ -736,11 +735,6 @@ int init_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi, char *data)
736 if (err) 735 if (err)
737 goto failed_sbh; 736 goto failed_sbh;
738 737
739 /* Initialize gcinode cache */
740 err = nilfs_init_gccache(nilfs);
741 if (err)
742 goto failed_sbh;
743
744 set_nilfs_init(nilfs); 738 set_nilfs_init(nilfs);
745 err = 0; 739 err = 0;
746 out: 740 out: