btrfs: normalize the error handling branch in btrfs_init_sysfs()
PATCH v2 1/1 btrfs: normalize the error handling branch in btrfs_init_sysfs()
Although kset_unregister() can eventually remove all attribute files, explicitly rolling back with the matching function makes the code logic look clearer.
--- fs/btrfs/sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
v1 --> v2:
1. Add sysfs_unmerge_group() to unmerge group first.
2. Update subject and commit message, no resource leaks.
fs/btrfs/sysfs.c +5 -2
@@ -2321,8 +2321,11 @@ int __init btrfs_init_sysfs(void)#ifdef CONFIG_BTRFS_DEBUG ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_debug_feature_attr_group); -if (ret) - goto out2; +if (ret) { +sysfs_unmerge_group (&btrfs_kset->kobj, + &btrfs_static_feature_attr_group); + goto out_remove_group; + }#endif return 0 ;
Signature · 1 line
2.25.1
Quoted 5 lines · Zhen Lei
Although
kset_unregister()can eventually remove all attribute files, explicitly rolling back with the matching function makes the code logic look clearer.Signed-off-by Zhen Lei <[email protected]>
Thanks,
Qu
Quoted 26 lines
--- fs/btrfs/sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)v1 --> v2:
1. Addsysfs_unmerge_group()to unmerge group first.
2. Update subject and commit message, no resource leaks.fs/btrfs/sysfs.c +5
-2@@ -2321,8 +2321,11 @@ int __init btrfs_init_sysfs(void)#ifdef CONFIG_BTRFS_DEBUG ret =sysfs_create_group (&btrfs_kset->kobj, &btrfs_debug_feature_attr_group); -if (ret) - goto out2; +if (ret) { +sysfs_unmerge_group (&btrfs_kset->kobj, + &btrfs_static_feature_attr_group); + goto out_remove_group; + }#endif return 0 ;
Quoted 5 lines · Zhen Lei
Although
kset_unregister()can eventually remove all attribute files, explicitly rolling back with the matching function makes the code logic look clearer.Signed-off-by Zhen Lei <[email protected]>
Added to misc-next, thanks.