|
@@ -989,28 +989,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
goto free_root_inode;
|
|
|
}
|
|
|
|
|
|
- /* recover fsynced data */
|
|
|
- if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {
|
|
|
- err = recover_fsync_data(sbi);
|
|
|
- if (err)
|
|
|
- f2fs_msg(sb, KERN_ERR,
|
|
|
- "Cannot recover all fsync data errno=%ld", err);
|
|
|
- }
|
|
|
-
|
|
|
- /*
|
|
|
- * If filesystem is not mounted as read-only then
|
|
|
- * do start the gc_thread.
|
|
|
- */
|
|
|
- if (!(sb->s_flags & MS_RDONLY)) {
|
|
|
- /* After POR, we can run background GC thread.*/
|
|
|
- err = start_gc_thread(sbi);
|
|
|
- if (err)
|
|
|
- goto free_gc;
|
|
|
- }
|
|
|
-
|
|
|
err = f2fs_build_stats(sbi);
|
|
|
if (err)
|
|
|
- goto free_gc;
|
|
|
+ goto free_root_inode;
|
|
|
|
|
|
if (f2fs_proc_root)
|
|
|
sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);
|
|
@@ -1032,17 +1013,36 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
err = kobject_init_and_add(&sbi->s_kobj, &f2fs_ktype, NULL,
|
|
|
"%s", sb->s_id);
|
|
|
if (err)
|
|
|
- goto fail;
|
|
|
+ goto free_proc;
|
|
|
|
|
|
+ /* recover fsynced data */
|
|
|
+ if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {
|
|
|
+ err = recover_fsync_data(sbi);
|
|
|
+ if (err)
|
|
|
+ f2fs_msg(sb, KERN_ERR,
|
|
|
+ "Cannot recover all fsync data errno=%ld", err);
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * If filesystem is not mounted as read-only then
|
|
|
+ * do start the gc_thread.
|
|
|
+ */
|
|
|
+ if (!(sb->s_flags & MS_RDONLY)) {
|
|
|
+ /* After POR, we can run background GC thread.*/
|
|
|
+ err = start_gc_thread(sbi);
|
|
|
+ if (err)
|
|
|
+ goto free_kobj;
|
|
|
+ }
|
|
|
return 0;
|
|
|
-fail:
|
|
|
+
|
|
|
+free_kobj:
|
|
|
+ kobject_del(&sbi->s_kobj);
|
|
|
+free_proc:
|
|
|
if (sbi->s_proc) {
|
|
|
remove_proc_entry("segment_info", sbi->s_proc);
|
|
|
remove_proc_entry(sb->s_id, f2fs_proc_root);
|
|
|
}
|
|
|
f2fs_destroy_stats(sbi);
|
|
|
-free_gc:
|
|
|
- stop_gc_thread(sbi);
|
|
|
free_root_inode:
|
|
|
dput(sb->s_root);
|
|
|
sb->s_root = NULL;
|