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:     Ryusuke Konishi <konishi.ryusuke@gmail.com>
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-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 10/10] nilfs2: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:05 +0800
Message-Id: <20230322165905.55389-9-frank.li@vivo.com>
In-Reply-To: <20230322165905.55389-1-frank.li@vivo.com>
References: <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?NmUFVd3EVSrMCT62QQ+hjFuFvzqh9L4ERpJJnN2UcJBZYdamb/sgygGBFQOY?=
 =?us-ascii?Q?pJFzZ+kzdDM90OuiejhcvZwBm+pydRvwlTHr2RIyuEjoATV56Gbp+B3TSRdw?=
 =?us-ascii?Q?xhfbdMSOsuUzUzBrAfiK8eT4Uqdqvv3VHewvs3QbfAI3EYlNBMzR8HH9xPLM?=
 =?us-ascii?Q?nhtf3iwn91lsiYPwPIV3mFDdFJgJJqKPZ0b6IpIjONFjC9xfZI5WLnamWw4P?=
 =?us-ascii?Q?B+tW2VNuL0BbYlNhL0ybyM/bEc20SYydVrowLpSFMcGY/zSgb+seChKcptGF?=
 =?us-ascii?Q?ty3aOQpRh9W+60etwUQNPjwcHxNkOyIFKLMaIvtK1uQ5JCirWCSAYofiLq5J?=
 =?us-ascii?Q?Ct4PUVG3UpbiHyWHbVv+krpYOhc/DfnQRsJf+XfskXGxsovGeMzVe60tylp3?=
 =?us-ascii?Q?G6UzZu2TWmI5FDJNgtEtpyCVVowmJARP1F6AgXDZaRmXVSV8fE4ScR1QnqUk?=
 =?us-ascii?Q?Vfcpudq68UVAxhOJ6KowPlhAwKx/fY61F9sakEXK5/riIpHxfjvfm2CKDgca?=
 =?us-ascii?Q?wpqE/MMZ0SNpISvVgzJ0b741sKo8U4D6l9P4WEy7T705agwJRxGk6/Wex8N6?=
 =?us-ascii?Q?VOa70Ij9V1UR1uNjM7JqW+5OmgtxAMzayHd2WzwmkY7xP4fH19I142F8Oy71?=
 =?us-ascii?Q?7ZQo2GhdFAk9d8xk7yIfUVLRquH6lsstTqBaiQKH6Kl2osAGZ6m7rjZCzVVw?=
 =?us-ascii?Q?TXKaVm4VvRGXzx/QUXVRXX0TDDAHA3Yp8AvZBD8e0+87Tor/MXw0HZazTC0c?=
 =?us-ascii?Q?HqrtAWuJ3sdBKTj1nVwhWBu6jjPTMiXtKe/VCTOUE94QBr8MFxvWvdpjC6ZK?=
 =?us-ascii?Q?3/3bqUwCZU+E4kiN/3RtTacmNY7jhrb8NFxdqSYoKCw3DMKpu3LzAF+PJzKm?=
 =?us-ascii?Q?S9P0kpg6sbXYDtSPIL3mnwC3dnv7RLd7JCR17vpmIAH1MuEBxrE09TkDM11l?=
 =?us-ascii?Q?ojoHTVJsZIl3W6ERVbnl2q0/iagrUrZsR/F5NWRAu2SUKakD2kmIJma3Srvb?=
 =?us-ascii?Q?jcO8otu5h7GAGgLaTdt1/+dEPGME0NiOSJ7BTjQ7KbrO9tGVURjbc26Ph58d?=
 =?us-ascii?Q?qx8roAuD6DWyp6N1UyxSLlyTer7ugfe81/cXa3BHdAPBzmMV9UpKs8s3Dog0?=
 =?us-ascii?Q?yWqFjXH0WcV0398Tt6Y5drNTpVuN091y7+ZgnXCp8fdqRY2wFYhh2wEUq147?=
 =?us-ascii?Q?6rm8UcWXOkkkvdHfDVSTeAe7gkqhf44QSZF3DjyypEVRdic+gh/E8CMZibPH?=
 =?us-ascii?Q?B3T7fOzUATHjdke/zJiKoWH0/Uuf7fQ5RMg7O/YGHZX0W+Y1Fi20mWkLgNGY?=
 =?us-ascii?Q?/i17lbHRK7ix0IuUbPsaZxsUFzK9i+PhkihHgkh/l3ZUhh9wRkoosr/5jj10?=
 =?us-ascii?Q?qx5lm1zv0OXYDOplOGNytNRS9kdZIfcpNZfedbHA13xKYLJEsb9fR/eYACku?=
 =?us-ascii?Q?PRI4Hu0MEXh9v1zaO9lN0Z/YdLGU7Ff8zJhRvYtBMiz11Q1YlehX4Y6F33MY?=
 =?us-ascii?Q?O2gyo3Q0D7L4yUs+x5n9WDr1A7TOO0cvrImQbr17OjGm26VgNLm5ZS5CuZMq?=
 =?us-ascii?Q?jZmNh2onAS9hxuZznWFwA+F5ze1hQbc3Z2UU2VQS?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b9d1b65a-5fdf-4db2-c118-08db2af6dfce
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 17:00:01.0903
 (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: nuzlIMocUqG80V+U/PIFblVG0Ra7ILsk/1FGRvzUjM/M8HSkBq/kdaO9DkD5G6CE7U4G/+ydixbQB0Ik1JUG9g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4107
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/nilfs2/sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index 379d22e28ed6..150965d58ca5 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -1042,8 +1042,7 @@ void nilfs_sysfs_delete_device_group(struct the_nilfs *nilfs)
 	nilfs_sysfs_delete_segments_group(nilfs);
 	nilfs_sysfs_delete_superblock_group(nilfs);
 	nilfs_sysfs_delete_segctor_group(nilfs);
-	kobject_del(&nilfs->ns_dev_kobj);
-	kobject_put(&nilfs->ns_dev_kobj);
+	kobject_del_and_put(&nilfs->ns_dev_kobj);
 	kfree(nilfs->ns_dev_subgroups);
 }
 
-- 
2.35.1