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>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org
Subject: [PATCH v3 02/10] f2fs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:58:57 +0800
Message-Id: <20230322165905.55389-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?2SuS710xo5cwPNs+eMsmsHQm1GFgGOwn0yovemWsrqKWiPlklfggxy1TrGwC?=
 =?us-ascii?Q?L2MpZsEiHTRobi8/voam5OldcrKZ++HF58BsJAbLWZNxspmQstkzi5DUyA1t?=
 =?us-ascii?Q?Bn53nagoxuh16eDcV4yfritF/UeyoX/wq/2Uo7Tz7T8kzsLu06THK65dL/7O?=
 =?us-ascii?Q?NMtmxhUIjMDVXfL/ovTYTY6S3Z6zvXvXvNGxWp2gx5SsgQdUM7V2XRs2L5Xe?=
 =?us-ascii?Q?TZd7ImRLgqXVViYHggjGIV0ZRJJBe5+O6RZfQxbkxec82Wb9Di9Dg3YFf+89?=
 =?us-ascii?Q?+oEK4e8+PZDIJzEBXcbGzO6iiAbMvgFivVYwjNT1zdlmlaHvHFFvHt0jSnjp?=
 =?us-ascii?Q?5647W+BjhFnF7CF2jWzLfASnp9Dxnbl3lM7svic8qXbxHCynCUdTMhZ/pMuX?=
 =?us-ascii?Q?qVepImawFepYNQFXpQ1RAgf4v86BrJ5TBCesIjV2AkeOYu5bzMP+nxPqPCuB?=
 =?us-ascii?Q?/eoOHWS1NkFsxNYOIEOWnmj1ag18vdXoj+owf50+QMkWwQQWbY3JOL/TnbDR?=
 =?us-ascii?Q?YTU1Mfxa12Sms4PewByjnnwoMWcwAs0unjZc78o/S1L1RYC1XcsOIj9nSPu1?=
 =?us-ascii?Q?UTmfBT+5DlEzVBYOPg+UUSoJ0/xE8D22mDUr+wfqhuPlXUko2l+lSXCdWg/h?=
 =?us-ascii?Q?DVGYvT4Bpbcwr0midvvOKH7VyXaYXaLMmDdUlF9An7cnsaMM8TJEqmR/e/ps?=
 =?us-ascii?Q?/34jZc+8lSPtf4bt8rtmkBavFovqPR9fSyCm0GkP3DEkKwjIZSJbi7y9Ausu?=
 =?us-ascii?Q?+ZPE4kB3hHfe+vnZf62+Uxzo1JxcuEfFA2zlyzYHVkIBMR2ri6JBDZSmy4O/?=
 =?us-ascii?Q?szP0omIOCK2SQPilhrjSOwK8vcHVErBuHRolgXQhbEoZNfS675gTo3GWo5oW?=
 =?us-ascii?Q?EXfZETiQi1ZfAS3184nF001+9Kw6DI6T63ozwmOBVaPm5Bg0fI5r+bgWyndE?=
 =?us-ascii?Q?J2b/sQd3tTXdMv5yPqsyU21xbRf32+/imChqI8qC8LuWUQ1XD+CAsHyGPKqZ?=
 =?us-ascii?Q?lEcecpxZaqxP4alUaNX4o+n4ADkwlmwKbihHp/4YBqI5+0PTqv0DLaCQ66DO?=
 =?us-ascii?Q?QnkXmdypIJART+p8S67JwilRrUT46oBeGM3YzaULAiDpvZz/IuVDToexbtas?=
 =?us-ascii?Q?xrW7AQARYwFeYzHoOC6yuAsybrI6B1Rfhn/kcig4jD2UgZzMQTe/ujxTfR+8?=
 =?us-ascii?Q?SW8YS9wuwhoeAtPWSvxSZcGfynk2vZb+xi06eIaXM6Jkb+FQYLGBuKrZxR7o?=
 =?us-ascii?Q?cXW++qoJJu4odOKlKxSZ5J80At80FSxLCkrFRSY6YkVfNNRFQB2LhLk3W/67?=
 =?us-ascii?Q?PPwp4QgK5XQmVAzHpF6icCjRcNCvuWtWJmbOIwhg6IuWRlwBGVr+Tib16kD+?=
 =?us-ascii?Q?mbeoSIkKRWQD3M8O61PtTlSFv0A0VZHZ1jWt/0H6Y2fAQyBRVhvoJqELXXBj?=
 =?us-ascii?Q?8PZ1WbfEQaw8PVdQFzURalUBOqjNys8f2WmsxCjJkgkywLqNHtXxtV0WSbya?=
 =?us-ascii?Q?G3Vg6VhP9AfgW+Ca0Xl+C2QSfuLH7ApblEJhPy6ohDqx3wv9ykb3jjX15Mpk?=
 =?us-ascii?Q?pmSLf1qWhbF4bDg7+or3YzBZYgsIfXYMi5xm6cyh?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56b51b13-7de4-4a54-0d8d-08db2af6c6be
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 16:59:19.0847
 (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: Rf+8mNyL3G7CG5EvG5nyj9kZczFQZ0f4IIAErLolaZ0gVFWLEqP1XnqM6TJoQwoTJ2wleMe5akdK5/dy1iBX6Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5238
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,URIBL_BLOCKED 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

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/sysfs.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 9ddc6ee19433..b455afc12cfc 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -1478,14 +1478,11 @@ void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi)
 		remove_proc_entry(sbi->sb->s_id, f2fs_proc_root);
 	}
 
-	kobject_del(&sbi->s_stat_kobj);
-	kobject_put(&sbi->s_stat_kobj);
+	kobject_del_and_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);
+	kobject_del_and_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);
+	kobject_del_and_put(&sbi->s_kobj);
 	wait_for_completion(&sbi->s_kobj_unregister);
 }
-- 
2.35.1