forked from Minki/linux
f2fs: fix memory leak after kobject init failed in fill_super
If we failed to init&add kobject when fill_super, stats info and proc object of f2fs will not be released. We should free them before we finish fill_super. Signed-off-by: Chao Yu <chao2.yu@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
parent
fb51b5ef9c
commit
1d15bd2034
@ -975,12 +975,12 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
|||||||
/* After POR, we can run background GC thread.*/
|
/* After POR, we can run background GC thread.*/
|
||||||
err = start_gc_thread(sbi);
|
err = start_gc_thread(sbi);
|
||||||
if (err)
|
if (err)
|
||||||
goto fail;
|
goto free_gc;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = f2fs_build_stats(sbi);
|
err = f2fs_build_stats(sbi);
|
||||||
if (err)
|
if (err)
|
||||||
goto fail;
|
goto free_gc;
|
||||||
|
|
||||||
if (f2fs_proc_root)
|
if (f2fs_proc_root)
|
||||||
sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);
|
sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);
|
||||||
@ -1006,6 +1006,12 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
fail:
|
fail:
|
||||||
|
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);
|
stop_gc_thread(sbi);
|
||||||
free_root_inode:
|
free_root_inode:
|
||||||
dput(sb->s_root);
|
dput(sb->s_root);
|
||||||
|
Loading…
Reference in New Issue
Block a user