From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/4] btrfs: sysfs, use btrfs_sysfs_remove_fsid in fail return in add_fsid
Date: Thu, 5 Dec 2019 19:27:03 +0800 [thread overview]
Message-ID: <20191205112706.8125-2-anand.jain@oracle.com> (raw)
In-Reply-To: <20191205112706.8125-1-anand.jain@oracle.com>
We have one simple function btrfs_sysfs_remove_fsid() to cleanup
kobjects added by btrfs_sysfs_add_fsid() and calls kobject_put() and
kobject_delete() only if the kobject is initialized or not null.
So use this function while retreating in the function
btrfs_sysfs_add_fsid().
One difference though, earlier we did not call kobject_del() during
retreat in btrfs_sysfs_add_fsid() and I did experiment to figureout
if that's an error or warning, however I didn't notice any such issues
with or without kobject_del() not being called.
So this patch is just for cleanup.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/sysfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 16379f491ca1..4cda410f0e6b 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1076,7 +1076,7 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs)
if (!fs_devs->devices_kobj) {
btrfs_err(fs_devs->fs_info,
"failed to init sysfs device interface");
- kobject_put(&fs_devs->fsid_kobj);
+ btrfs_sysfs_remove_fsid(fs_devs);
return -ENOMEM;
}
--
2.23.0
next prev parent reply other threads:[~2019-12-05 11:29 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 11:27 [PATCH 0/4] btrfs, sysfs cleanup and add dev_state Anand Jain
2019-12-05 11:27 ` Anand Jain [this message]
2019-12-05 11:27 ` [PATCH 2/4] btrfs: sysfs, add UUID/devinfo kobject Anand Jain
2020-01-14 18:32 ` David Sterba
2020-02-03 10:40 ` Anand Jain
2019-12-05 11:27 ` [PATCH v2 3/4] btrfs: sysfs, rename device_link add,remove functions Anand Jain
2019-12-05 11:27 ` [PATCH 4/4] btrfs: sysfs, add devid/dev_state kobject and attribute Anand Jain
2019-12-05 14:10 ` David Sterba
2019-12-05 14:38 ` Anand Jain
2019-12-05 14:21 ` David Sterba
2019-12-05 14:38 ` Anand Jain
2019-12-05 15:14 ` David Sterba
2019-12-06 13:49 ` Anand Jain
2019-12-09 14:05 ` Anand Jain
2019-12-09 18:31 ` David Sterba
2019-12-13 16:43 ` David Sterba
2019-12-13 17:02 ` David Sterba
2019-12-14 0:26 ` Anand Jain
2020-01-06 16:00 ` David Sterba
2019-12-09 14:06 ` [PATCH v2 " Anand Jain
2019-12-19 10:41 ` [PATCH v3 " Anand Jain
2020-01-06 11:38 ` [PATCH v4] " Anand Jain
2020-01-09 15:20 ` [PATCH v4 4/4] " David Sterba
2020-01-10 1:03 ` Anand Jain
2019-12-05 15:00 ` [PATCH 0/4] btrfs, sysfs cleanup and add dev_state David Sterba
2019-12-06 13:46 ` Anand Jain
2019-12-09 14:09 ` Anand Jain
2019-12-09 22:48 ` Anand Jain
2019-12-10 16:41 ` David Sterba
2020-01-14 18:39 ` David Sterba
2020-01-15 8:22 ` [PATCH] btrfs: update devid after replace Anand Jain
2020-01-15 16:17 ` David Sterba
2020-01-20 19:10 ` David Sterba
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=20191205112706.8125-2-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@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