Skip to content

Commit 33560f8

Browse files
bbkzzJaegeuk Kim
authored andcommitted
f2fs: remove bulk remove_proc_entry() and unnecessary kobject_del()
Convert to use remove_proc_subtree() and kill kobject_del() directly. kobject_put() actually covers kobject removal automatically, which is single stage removal. Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 50aa6f4 commit 33560f8

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

fs/f2fs/sysfs.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,25 +1462,14 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)
14621462

14631463
void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi)
14641464
{
1465-
if (sbi->s_proc) {
1466-
#ifdef CONFIG_F2FS_IOSTAT
1467-
remove_proc_entry("iostat_info", sbi->s_proc);
1468-
#endif
1469-
remove_proc_entry("segment_info", sbi->s_proc);
1470-
remove_proc_entry("segment_bits", sbi->s_proc);
1471-
remove_proc_entry("victim_bits", sbi->s_proc);
1472-
remove_proc_entry("discard_plist_info", sbi->s_proc);
1473-
remove_proc_entry(sbi->sb->s_id, f2fs_proc_root);
1474-
}
1465+
if (sbi->s_proc)
1466+
remove_proc_subtree(sbi->sb->s_id, f2fs_proc_root);
14751467

1476-
kobject_del(&sbi->s_stat_kobj);
14771468
kobject_put(&sbi->s_stat_kobj);
14781469
wait_for_completion(&sbi->s_stat_kobj_unregister);
1479-
kobject_del(&sbi->s_feature_list_kobj);
14801470
kobject_put(&sbi->s_feature_list_kobj);
14811471
wait_for_completion(&sbi->s_feature_list_kobj_unregister);
14821472

1483-
kobject_del(&sbi->s_kobj);
14841473
kobject_put(&sbi->s_kobj);
14851474
wait_for_completion(&sbi->s_kobj_unregister);
14861475
}

0 commit comments

Comments
 (0)