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>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/10] btrfs: convert to kobject_del_and_put()
Date: Sun, 19 Mar 2023 16:41:29 +0800 [thread overview]
Message-ID: <20230319084134.11804-6-frank.li@vivo.com> (raw)
In-Reply-To: <20230319084134.11804-1-frank.li@vivo.com>
Use kobject_del_and_put() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.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
next prev parent reply other threads:[~2023-03-19 8:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 8:41 [PATCH v2 01/10] kobject: introduce kobject_del_and_put() Yangtao Li
2023-03-19 8:41 ` [PATCH v2 02/10] f2fs: convert to kobject_del_and_put() Yangtao Li
2023-03-19 8:41 ` [PATCH v2 03/10] erofs: " Yangtao Li
2023-03-19 8:41 ` [PATCH v2 04/10] zonefs: " Yangtao Li
2023-03-19 8:41 ` [PATCH v2 05/10] ubifs: " Yangtao Li
2023-03-19 8:41 ` Yangtao Li [this message]
2023-03-19 8:41 ` [PATCH v2 07/10] xfs: " Yangtao Li
2023-03-19 8:41 ` [PATCH v2 08/10] ocfs2: " Yangtao Li
2023-03-19 8:41 ` [PATCH v2 09/10] nfs: " Yangtao Li
2023-03-19 8:41 ` [PATCH v2 10/10] nilfs2: " Yangtao Li
2023-03-19 9:08 ` [PATCH v2 01/10] kobject: introduce kobject_del_and_put() Greg Kroah-Hartman
2023-03-19 9:36 ` Yangtao Li
2023-03-19 10:06 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319084134.11804-6-frank.li@vivo.com \
--to=frank.li@vivo.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®