Skip to content

Commit

Permalink
f2fs: remove bulk remove_proc_entry() and unnecessary kobject_del()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yangtao Li authored and Jaegeuk Kim committed Apr 17, 2023
1 parent 50aa6f4 commit 33560f8
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions fs/f2fs/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1462,25 +1462,14 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)

void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi)
{
if (sbi->s_proc) {
#ifdef CONFIG_F2FS_IOSTAT
remove_proc_entry("iostat_info", sbi->s_proc);
#endif
remove_proc_entry("segment_info", sbi->s_proc);
remove_proc_entry("segment_bits", sbi->s_proc);
remove_proc_entry("victim_bits", sbi->s_proc);
remove_proc_entry("discard_plist_info", sbi->s_proc);
remove_proc_entry(sbi->sb->s_id, f2fs_proc_root);
}
if (sbi->s_proc)
remove_proc_subtree(sbi->sb->s_id, f2fs_proc_root);

kobject_del(&sbi->s_stat_kobj);
kobject_put(&sbi->s_stat_kobj);
wait_for_completion(&sbi->s_stat_kobj_unregister);
kobject_del(&sbi->s_feature_list_kobj);
kobject_put(&sbi->s_feature_list_kobj);
wait_for_completion(&sbi->s_feature_list_kobj_unregister);

kobject_del(&sbi->s_kobj);
kobject_put(&sbi->s_kobj);
wait_for_completion(&sbi->s_kobj_unregister);
}

0 comments on commit 33560f8

Please sign in to comment.