Commit ffdbb44f authored by Zhen Lei's avatar Zhen Lei Committed by David Sterba
Browse files

btrfs: sysfs: 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.

CC: stable@vger.kernel.org # 5.4+
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 796787c9

fs/btrfs/sysfs.c

+5 −2
Original line number Diff line number Diff line
@@ -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;