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:     Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.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-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 06/10] btrfs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:01 +0800
Message-Id: <20230322165905.55389-5-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?I6eb+6MxFN1e8eMrNgOeaXwxkwRpDqZ1itx6fxW4C1fkQTHjsu1o1U+8ZaUn?=
 =?us-ascii?Q?wYuRVyakgNyKIfqOm5Vj7HaF5JLjvgVV4FtHeD5lN/gfSwnOnZbHyAJGqNRt?=
 =?us-ascii?Q?qsWqvLch4826E9U3xMxyGxuPCh+3kwbD+EurhwXxOXoIWx/+h+9x1bC6XYae?=
 =?us-ascii?Q?IGzvMruiqzWuVxkQx7wRATM0UQHHkeF2riFf8B6EuhVkcJjs2dSJ+TtW8tfQ?=
 =?us-ascii?Q?uERRMz36k279cDarheTnJDPLJeOoY3IzKuMo0F0Etn6wXfp+fosF4sDLn+Nd?=
 =?us-ascii?Q?vXZpBILMsLMZQpMnOVpwboF5qrw3hNnPaFmTb9XaPBrkJnFLgYVykOOkOljP?=
 =?us-ascii?Q?r5e6Swv285z4TXRPrYGZ7tr4+1lyf3hBIvOwAtK9+/H5UHq2Bfqp90yIo9cQ?=
 =?us-ascii?Q?Oq7gHeF03yPwLHyQMDTlb6BgjL/p+jZzMkRNJyQ1m5q9Z8o+6ubifevuaIYp?=
 =?us-ascii?Q?IxgIBji4t8jjNWSMLsnpGl+0xQUFSpsV+1z6iNF1Gz4Q6cDKAqLMHIlzMMPw?=
 =?us-ascii?Q?0Bt1ioETeRWe3PVPsEoGBwncdWd604o+ig9blgjNKCsyJ4Y8ngxAxlQCkaKL?=
 =?us-ascii?Q?ERUhSF5Sb3+iJyfOBISNiXES+FybcJd0yl9LDbHweKKUSK2xRhB75/uer+TN?=
 =?us-ascii?Q?nM0aF8MbzdkcQKaqO8+zpHleaqg8j6TvB+5M8cIY0FakbhSuMHWuc56/t0tr?=
 =?us-ascii?Q?O5qqfxhetOdiqtMV8KI++Px+C7tdiRpOkJJ5UchI8zMiLQVPvSafbPA5yjE1?=
 =?us-ascii?Q?QjwPcIqgFsrjdCYkE/AB2VJQjD7GEaNe03RC9RTNC2cKZffGax3XEsf/Ez4j?=
 =?us-ascii?Q?+B0Kesz25nGDt94kCRkEhD+0d5kndQxTclxdeB/zVfKC36xfQzvqa1fX2hwc?=
 =?us-ascii?Q?Zs5sufM4uWHBsz0LwklY7QWJeB2407ScvO5aSdoL0BxfxbapYEPv4qS06c7f?=
 =?us-ascii?Q?3MJCyfiSPAUidZbMyyAUcQGUukPhKOFmSoMPBizHvjE7RU0jIUb9dsoI4sdH?=
 =?us-ascii?Q?D7bKlQ6AGA3k75tOcB3aEaRquzhyrWUMHByHzXfm+JA1cB7XZHDmtI5ay5nv?=
 =?us-ascii?Q?xlBynXM+KW364rc1VpB8wv40wYl1xB1nMDSW6Sz3owSQLTB8xVGJ9nuP1MCk?=
 =?us-ascii?Q?PIYUehE6eiqZfSn2HURSlVkwofvxBR8mVpOquuuP8AjRlRqEj9/eIM1n59MC?=
 =?us-ascii?Q?kajGYYQXEUBQpSWRfizVJdrUJUYfCDSQ9GOyTB3STOKhSnmWP4xSorSOrHpm?=
 =?us-ascii?Q?RznYnATOEY7em50xZ+fiapd0YZEGKg87R3G3bCOsJTbknxuAabRrcjzkfrCs?=
 =?us-ascii?Q?YG+M8/orb2jsaddBDQvV+kWh9RJqsjbNUvbt3+fxTem755DWL3Otek3PQlPU?=
 =?us-ascii?Q?wMKGBLBcZ86LugHpNLI4HtVJcb4s7qs1zXqlxKd+kg+Lvt/dxeJrm7E/J02x?=
 =?us-ascii?Q?mPiuA/sMP2tENAiWA/H2VxrNvMYpzIzJM0/aJ10bBIFt5hHaAS3dJxfnx0Xz?=
 =?us-ascii?Q?KENxx7n1fbdj8ZDr792Px2Bsw/Yu8CsX00IpXrC09kR3g3QVUoTWc0vAVGgH?=
 =?us-ascii?Q?vyNuzpeN12XTcx483B9TC8JIeZH9vq5rsyigCOuo?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8c93a3d4-68ca-4dd6-8f01-08db2af6d925
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:49.8370
 (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: P9LR7c8BQ7IG888oPxUMRAidFegL4EjLm83RedobsfV1SFw1NwTCfpDcKTYarqObmOmrpCkARJ6lIrMsIK8JIA==
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>
Acked-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/block-group.c |  5 +----
 fs/btrfs/sysfs.c       | 38 ++++++++++++--------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 5fc670c27f86..a2876235c6dc 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1125,10 +1125,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 	}
 	up_write(&block_group->space_info->groups_sem);
 	clear_incompat_bg_bits(fs_info, block_group->flags);
-	if (kobj) {
-		kobject_del(kobj);
-		kobject_put(kobj);
-	}
+	kobject_del_and_put(kobj);
 
 	if (block_group->cached == BTRFS_CACHE_STARTED)
 		btrfs_wait_block_group_cache_done(block_group);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 37fc58a7f27e..49b837561135 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1390,20 +1390,17 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
 static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
 {
 	if (fs_devs->devinfo_kobj) {
-		kobject_del(fs_devs->devinfo_kobj);
-		kobject_put(fs_devs->devinfo_kobj);
+		kobject_del_and_put(fs_devs->devinfo_kobj);
 		fs_devs->devinfo_kobj = NULL;
 	}
 
 	if (fs_devs->devices_kobj) {
-		kobject_del(fs_devs->devices_kobj);
-		kobject_put(fs_devs->devices_kobj);
+		kobject_del_and_put(fs_devs->devices_kobj);
 		fs_devs->devices_kobj = NULL;
 	}
 
 	if (fs_devs->fsid_kobj.state_initialized) {
-		kobject_del(&fs_devs->fsid_kobj);
-		kobject_put(&fs_devs->fsid_kobj);
+		kobject_del_and_put(&fs_devs->fsid_kobj);
 		wait_for_completion(&fs_devs->kobj_unregister);
 	}
 }
@@ -1445,19 +1442,16 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
 
 	if (fs_info->space_info_kobj) {
 		sysfs_remove_files(fs_info->space_info_kobj, allocation_attrs);
-		kobject_del(fs_info->space_info_kobj);
-		kobject_put(fs_info->space_info_kobj);
+		kobject_del_and_put(fs_info->space_info_kobj);
 	}
 	if (fs_info->discard_kobj) {
 		sysfs_remove_files(fs_info->discard_kobj, discard_attrs);
-		kobject_del(fs_info->discard_kobj);
-		kobject_put(fs_info->discard_kobj);
+		kobject_del_and_put(fs_info->discard_kobj);
 	}
 #ifdef CONFIG_BTRFS_DEBUG
 	if (fs_info->debug_kobj) {
 		sysfs_remove_files(fs_info->debug_kobj, btrfs_debug_mount_attrs);
-		kobject_del(fs_info->debug_kobj);
-		kobject_put(fs_info->debug_kobj);
+		kobject_del_and_put(fs_info->debug_kobj);
 	}
 #endif
 	addrm_unknown_feature_attrs(fs_info, false);
@@ -1620,13 +1614,9 @@ void btrfs_sysfs_remove_space_info(struct btrfs_space_info *space_info)
 
 		kobj = space_info->block_group_kobjs[i];
 		space_info->block_group_kobjs[i] = NULL;
-		if (kobj) {
-			kobject_del(kobj);
-			kobject_put(kobj);
-		}
+		kobject_del_and_put(kobj);
 	}
-	kobject_del(&space_info->kobj);
-	kobject_put(&space_info->kobj);
+	kobject_del_and_put(&space_info->kobj);
 }
 
 static const char *alloc_name(u64 flags)
@@ -1681,8 +1671,7 @@ void btrfs_sysfs_remove_device(struct btrfs_device *device)
 		sysfs_remove_link(devices_kobj, bdev_kobj(device->bdev)->name);
 
 	if (device->devid_kobj.state_initialized) {
-		kobject_del(&device->devid_kobj);
-		kobject_put(&device->devid_kobj);
+		kobject_del_and_put(&device->devid_kobj);
 		wait_for_completion(&device->kobj_unregister);
 	}
 }
@@ -2255,8 +2244,7 @@ void btrfs_sysfs_del_qgroups(struct btrfs_fs_info *fs_info)
 					     &fs_info->qgroup_tree, node)
 		btrfs_sysfs_del_one_qgroup(fs_info, qgroup);
 	if (fs_info->qgroups_kobj) {
-		kobject_del(fs_info->qgroups_kobj);
-		kobject_put(fs_info->qgroups_kobj);
+		kobject_del_and_put(fs_info->qgroups_kobj);
 		fs_info->qgroups_kobj = NULL;
 	}
 }
@@ -2304,10 +2292,8 @@ void btrfs_sysfs_del_one_qgroup(struct btrfs_fs_info *fs_info,
 	if (test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state))
 		return;
 
-	if (qgroup->kobj.state_initialized) {
-		kobject_del(&qgroup->kobj);
-		kobject_put(&qgroup->kobj);
-	}
+	if (qgroup->kobj.state_initialized)
+		kobject_del_and_put(&qgroup->kobj);
 }
 
 /*
-- 
2.35.1