Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <351a524a-3739-e9f3-3b20-0854e8b2a1af@gmx.com>
Date:   Tue, 22 Nov 2022 19:59:53 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.0
Subject: Re: [PATCH v2] btrfs: normalize the error handling branch in
 btrfs_init_sysfs()
To:     Zhen Lei <thunder.leizhen@huawei.com>, Chris Mason <clm@fb.com>,
        Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20221122115002.1831-1-thunder.leizhen@huawei.com>
Content-Language: en-US
From:   Qu Wenruo <quwenruo.btrfs@gmx.com>
In-Reply-To: <20221122115002.1831-1-thunder.leizhen@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
UI-OutboundReport: notjunk:1;M01:P0:tHUVKFLNqMQ=;Nq+/Vd6hju5hh2jLnYbYmllmq1q
 kpcN3X+FbzdBAH6UFMy4ZbDpvIHCCSf2eWUutVGi4o2j+Qq2cPQQG4PRQq/wHGu7/R7NPjubY
 MBcmRe1MLsEmWOcNCVCCXNq9+zfPk7UrGph1hNlYA27MMqhvBqlmgzeGCswuRPpii71WLDEtT
 hJz+eIlnP0pE68PJmsMKY4JjdSWkXFQBIbLutkhuqEbgG+J2zHfmCkuL8T9TgqTeioNDg4paa
 IFMC84ISTVSQOsma1Om8kwoXEhYAWq/ufivYSrBkjW6hyYpb9P/sryzVG0PCpmtCmQehHPWIW
 V9P00LCO+D4gpyadxyVlrmxBHJNM/dri9rvpX/vwPgysrrFkUScSfzXIqZeDBc/EvDB6PgdAH
 CjjfI1qzahMeblm/biQQ9GlGOT0D+I9K1uzYkfm7sLRAFdpnPTKrZ70AEgEbeaAimVXn06lVb
 x4umAzLipUc9yq199KvP3IWdtOJF/QI2fp8wna8wWobsXxXABRgnp1jaQR0IIMShGA+qc0MQi
 9VMKhTX/NRIFqkZ2fb89TjNbILdQ0BbcWbQwvauEv7bP0cWOjOuOKBfM5IzodrcBnASqulFVl
 OubbUSMY6G9ij8KM/fSK4EY6nLHFA2oWNAJK5OoxSNRo/nIMIEQUF8KLB7hta3HQyCvmrJ9MR
 WZFOs9IJjkNJOMXuuCFayDGmQOmSf9zT5ExkbRtlQliwI1VwxsS5b4IiyhxPhmO0JEQKWUwQe
 PYwMSLi4pl0k834yAYCGbZxLVgtO/eXe/IflzJQaAa4a16t4+sZOyPoBh3BgFuUU/legbq33b
 gGJJUInTOvzLtNcjrjMrpVFquQ+6+mjb3edETwTbZpolAAECwklI+BknsYxwEadJeAbrf+Y03
 Nj3EcnH/Uk8HsMtn9NBeVoBh2NBDI0Uo1j3TXxTAFrL9xYo70yJg9ZFf9IdwzQdchsLjLKwwg
 zUxj0JbWlev3A5pbP551hZcKrzU=
Precedence: bulk


On 2022/11/22 19:50, Zhen Lei wrote:
> 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 <thunder.leizhen@huawei.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   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.
> 
> diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
> index 699b54b3acaae0b..74fef1f49c358cd 100644
> --- a/fs/btrfs/sysfs.c
> +++ b/fs/btrfs/sysfs.c
> @@ -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;