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;
From:   Yangtao Li <frank.li@vivo.com>
To:     Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Subject: [PATCH] f2fs: remove bulk remove_proc_entry() and unnecessary kobject_del()
Date:   Fri,  7 Apr 2023 03:16:29 +0800
Message-Id: <20230406191629.63024-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VDLJC+tX6LIC9F938yiaWq6mIh36mb5oRD/c5v4i/ddFa6TIFnFTtZ0qEBUh?=
 =?us-ascii?Q?5tnwNTL5PLvjQE+I6F+KExP1TpueJn5sMZQfZ+76fdXl/JLNsf9wRDls4E1c?=
 =?us-ascii?Q?CZCrgT8DycV8ZzHJpm7/A37Y32InEa2iVyxV3XRFIv+ealdLWrVmj2knQGhF?=
 =?us-ascii?Q?WsV9SasPc13MSEgldfahAJ9oO6cax8HxBFc5dJFoiKXJBeHXN0KMtgH4W0yP?=
 =?us-ascii?Q?LyZFfahMzLxqLW8l4d341SvUI8AwuKEsBjfNxlsnkz/Ezdf13TCSMj9Ggl7Z?=
 =?us-ascii?Q?Q8gMtzkCqTZNo8857UXl8aIu1GVChqiEqo2AyVnTm0X6FfA0B4VCu03m9Uji?=
 =?us-ascii?Q?8s07umkCORFibDtji6Tu5yNCbh+B10QDDdPuMejyZz5WtOc2CNroqKGY4Zeq?=
 =?us-ascii?Q?jXwchC9uroPWTV3kuvd2NmgFM4rxCfBQHBL3nnUWWL9tDnM91yU/egNHo/iG?=
 =?us-ascii?Q?/pbwVCOVMSdB9UU2JD8MD/aadbk9O2q9cX3fEs8cY9G8wjE/YxqB6DCf6fKi?=
 =?us-ascii?Q?Tg6aFpxI4RIj6iMr1im64srtEEENGeJ1Zt30VOjR/LXmFIwY/dg3sTVn6zAd?=
 =?us-ascii?Q?+PFneQA4DPVIPnaaD0AkHlFhev6FvO6qZsiYhgLB6AEYwPYdGwAM/TMIJKla?=
 =?us-ascii?Q?ZyvvCLYyzUDgCCtDVw7MuFaqeGHSJ9/R3Ch9NV7DblpF/Ra5+QhmxwXaRv26?=
 =?us-ascii?Q?nL+IZ2S/5s2SHx932m4UV0oCTieMSsAjMm7HaciUqM0WDIoVk5T/dqlRBfq6?=
 =?us-ascii?Q?oI/ZA9RwmDroifiOJBQg1wer0jDWiaSo5PKj1t9s9IPlCpRHWVBplzANnEUj?=
 =?us-ascii?Q?OtMN5cr8HN/Yqqaf33I4bQwsxXBIBOWPSmIcJqiqB1GX4po8czwGY++7oNd1?=
 =?us-ascii?Q?FPpL/h25TIupgtEf0By5lxqd476p9HycQUNCX4Ngp+EtZ4VEJX6MMwBCzaCh?=
 =?us-ascii?Q?U1gF8yeLpHg51Lk5lR7BSN2xJAdvU6Y3pG5JQWjGfTvEBes18VpeWCvUwfPS?=
 =?us-ascii?Q?hjVJdAiqCJOw/AU929RKjUgIFAZw7YlLNxDUgAasLK0O52RAO6F0V6Kh0Ogr?=
 =?us-ascii?Q?ZVCpIyXbK5jEehYqfzOt8qZQC5+gbiNZIgSpCwMSIDZgDiesXXb3cYMYu/BS?=
 =?us-ascii?Q?F0aqZSgq1A5lS1YH8WlECUZaSd9GCRmhVAGsxZuFc1EODHX9LkQ7nopHKamJ?=
 =?us-ascii?Q?x/3hJJsEo4MvaBNyEdBLMFIO+14lLHZm3Pl/f0m+1bqsIJ/n1CJHX15aQul+?=
 =?us-ascii?Q?swGqw5VJH4NwVcQNH9DXXAq5piVVy4mHbBf84/DkvoQulLzd5I3aBZ+X10aV?=
 =?us-ascii?Q?crFnOyJkRbzLf39gYpBog7CtmtC46fPGKcfp0R0QNtlQlpLtSiFH39EUS61I?=
 =?us-ascii?Q?n3knAUagOLAvSBnTO2kSjb0kL3koAOVIiAlJhUsbbkOeaDh0ykDvi+t55waq?=
 =?us-ascii?Q?ppFS+twY2c2ASVmIxp72PIZFpuatvM5mQ615mKpXV9rvsp8phrwwgO19mT+Z?=
 =?us-ascii?Q?1v/Zeou67rx2Urydt2uf3VBPZpl5wAsB5DPcniff5vzEniviQcHFUN7Y9NO1?=
 =?us-ascii?Q?9a01lPwm0rORdfa4Sfk+0fpmq9FY7aVGGIiI0YH6?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a2c93997-bbbb-456b-eab0-08db36d373ab
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2023 19:16:41.1210
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rTWjOcyGrTGu3bbgvu7uA96dO+fiRYD8MlMTkCvo37OwH+vqFla/yjpvu5G3n957mI3LEZxfdd9d11Eq9xP6TQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4354
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---
 fs/f2fs/sysfs.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index dfbd17802549..3aad3500a701 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -1461,25 +1461,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);
 }
-- 
2.35.1