LinuxLists.cc - [PATCH v3 02/10] f2fs: convert to kobject_del_and

2023-03-22 17:03:37

Subject: [PATCH v3 02/10] f2fs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
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

2023-03-22 17:03:57

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 03/10] erofs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
fs/erofs/sysfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index 435e515c0792..9ed7d6552155 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -241,8 +241,7 @@ void erofs_unregister_sysfs(struct super_block *sb)
struct erofs_sb_info *sbi = EROFS_SB(sb);

if (sbi->s_kobj.state_in_sysfs) {
- 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

2023-03-22 17:04:06

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 06/10] btrfs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
Acked-by: David Sterba <[email protected]>
---
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

2023-03-22 17:04:08

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 07/10] xfs: convert to kobject_del_and_put()

2023-03-22 17:04:14

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 09/10] nfs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
fs/nfs/sysfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c
index 0cbcd2dfa732..a6072be5fa5a 100644
--- a/fs/nfs/sysfs.c
+++ b/fs/nfs/sysfs.c
@@ -185,8 +185,7 @@ void nfs_netns_sysfs_destroy(struct nfs_net *netns)

if (clp) {
kobject_uevent(&clp->kobject, KOBJ_REMOVE);
- kobject_del(&clp->kobject);
- kobject_put(&clp->kobject);
+ kobject_del_and_put(&clp->kobject);
netns->nfs_client = NULL;
}
}
--
2.35.1

2023-03-22 17:04:22

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 08/10] ocfs2: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
fs/ocfs2/filecheck.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
index 1ad7106741f8..fb9cf601245b 100644
--- a/fs/ocfs2/filecheck.c
+++ b/fs/ocfs2/filecheck.c
@@ -198,8 +198,7 @@ void ocfs2_filecheck_remove_sysfs(struct ocfs2_super *osb)
if (!osb->osb_fc_ent.fs_fcheck)
return;

- kobject_del(&osb->osb_fc_ent.fs_kobj);
- kobject_put(&osb->osb_fc_ent.fs_kobj);
+ kobject_del_and_put(&osb->osb_fc_ent.fs_kobj);
wait_for_completion(&osb->osb_fc_ent.fs_kobj_unregister);
ocfs2_filecheck_sysfs_free(&osb->osb_fc_ent);
}
--
2.35.1

2023-03-22 17:04:24

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 04/10] zonefs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
fs/zonefs/sysfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/zonefs/sysfs.c b/fs/zonefs/sysfs.c
index 8ccb65c2b419..5e117188fbb5 100644
--- a/fs/zonefs/sysfs.c
+++ b/fs/zonefs/sysfs.c
@@ -113,8 +113,7 @@ void zonefs_sysfs_unregister(struct super_block *sb)
if (!sbi || !sbi->s_sysfs_registered)
return;

- 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

2023-03-22 17:04:31

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 10/10] nilfs2: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
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

2023-03-22 17:05:24

by 李扬韬

[permalink] [raw]

Subject: [PATCH v3 05/10] ubifs: convert to kobject_del_and_put()

Use kobject_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Damien Le Moal <[email protected]>
Signed-off-by: Yangtao Li <[email protected]>
---
fs/ubifs/sysfs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c
index 1c958148bb87..9571718e61a9 100644
--- a/fs/ubifs/sysfs.c
+++ b/fs/ubifs/sysfs.c
@@ -130,8 +130,7 @@ int ubifs_sysfs_register(struct ubifs_info *c)

void ubifs_sysfs_unregister(struct ubifs_info *c)
{
- kobject_del(&c->kobj);
- kobject_put(&c->kobj);
+ kobject_del_and_put(&c->kobj);
wait_for_completion(&c->kobj_unregister);

kfree(c->stats);
--
2.35.1

2023-03-22 19:17:43

by Gao Xiang

[permalink] [raw]

Subject: Re: [PATCH v3 03/10] erofs: convert to kobject_del_and_put()

On 2023/3/23 00:58, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>

Acked-by: Gao Xiang <[email protected]>

Thanks,
Gao Xiang

> ---
> fs/erofs/sysfs.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
> index 435e515c0792..9ed7d6552155 100644
> --- a/fs/erofs/sysfs.c
> +++ b/fs/erofs/sysfs.c
> @@ -241,8 +241,7 @@ void erofs_unregister_sysfs(struct super_block *sb)
> struct erofs_sb_info *sbi = EROFS_SB(sb);
>
> if (sbi->s_kobj.state_in_sysfs) {
> - kobject_del(&sbi->s_kobj);
> - kobject_put(&sbi->s_kobj);
> + kobject_del_and_put(&sbi->s_kobj);
> wait_for_completion(&sbi->s_kobj_unregister);
> }
> }

2023-03-22 23:33:57

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 03/10] erofs: convert to kobject_del_and_put()

On 3/23/23 01:58, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>

Reviewed-by: Damien Le Moal <[email protected]>

--
Damien Le Moal
Western Digital Research

2023-03-22 23:34:00

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 02/10] f2fs: convert to kobject_del_and_put()

2023-03-22 23:34:41

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 04/10] zonefs: convert to kobject_del_and_put()

On 3/23/23 01:58, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>

Acked-by: Damien Le Moal <[email protected]>

--
Damien Le Moal
Western Digital Research

2023-03-22 23:39:33

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 05/10] ubifs: convert to kobject_del_and_put()

On 3/23/23 01:59, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>

Reviewed-by: Damien Le Moal <[email protected]>

--
Damien Le Moal
Western Digital Research

2023-03-22 23:39:42

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 07/10] xfs: convert to kobject_del_and_put()

On 3/23/23 01:59, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>
> Acked-by: Darrick J. Wong <[email protected]>

Reviewed-by: Damien Le Moal <[email protected]>

--
Damien Le Moal
Western Digital Research

2023-03-22 23:39:46

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 08/10] ocfs2: convert to kobject_del_and_put()

2023-03-22 23:39:50

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 09/10] nfs: convert to kobject_del_and_put()

2023-03-22 23:39:56

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 10/10] nilfs2: convert to kobject_del_and_put()

2023-03-22 23:40:01

by Damien Le Moal

[permalink] [raw]

Subject: Re: [PATCH v3 06/10] btrfs: convert to kobject_del_and_put()

On 3/23/23 01:59, Yangtao Li wrote:
> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>
> Acked-by: David Sterba <[email protected]>

Reviewed-by: Damien Le Moal <[email protected]>

--
Damien Le Moal
Western Digital Research

2023-03-23 01:15:50

by Zhihao Cheng

[permalink] [raw]

Subject: Re: [PATCH v3 05/10] ubifs: convert to kobject_del_and_put()

> Use kobject_del_and_put() to simplify code.
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: Damien Le Moal <[email protected]>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> fs/ubifs/sysfs.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>

Reviewed-by: Zhihao Cheng <[email protected]>
> diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c
> index 1c958148bb87..9571718e61a9 100644
> --- a/fs/ubifs/sysfs.c
> +++ b/fs/ubifs/sysfs.c
> @@ -130,8 +130,7 @@ int ubifs_sysfs_register(struct ubifs_info *c)
>
> void ubifs_sysfs_unregister(struct ubifs_info *c)
> {
> - kobject_del(&c->kobj);
> - kobject_put(&c->kobj);
> + kobject_del_and_put(&c->kobj);
> wait_for_completion(&c->kobj_unregister);
>
> kfree(c->stats);
>