From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 05/15] btrfs: sysfs, move /sys/fs/btrfs/UUID related functions together
Date: Mon, 18 Nov 2019 16:46:46 +0800 [thread overview]
Message-ID: <20191118084656.3089-6-anand.jain@oracle.com> (raw)
In-Reply-To: <20191118084656.3089-1-anand.jain@oracle.com>
No functional changes. Move functions to bring btrfs_sysfs_remove_fsid()
and btrfs_sysfs_add_fsid() and its related functions together.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/sysfs.c | 60 ++++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index d54777d5c78e..370f30561001 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -742,36 +742,6 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
return 0;
}
-static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
-{
- if (fs_devs->devices_dir_kobj) {
- kobject_del(fs_devs->devices_dir_kobj);
- kobject_put(fs_devs->devices_dir_kobj);
- fs_devs->devices_dir_kobj = NULL;
- }
-
- if (fs_devs->fsid_kobj.state_initialized) {
- kobject_del(&fs_devs->fsid_kobj);
- kobject_put(&fs_devs->fsid_kobj);
- wait_for_completion(&fs_devs->kobj_unregister);
- }
-}
-
-/* when fs_devs is NULL it will remove all fsid kobject */
-void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
-{
- struct list_head *fs_uuids = btrfs_get_fs_uuids();
-
- if (fs_devs) {
- __btrfs_sysfs_remove_fsid(fs_devs);
- return;
- }
-
- list_for_each_entry(fs_devs, fs_uuids, fs_list) {
- __btrfs_sysfs_remove_fsid(fs_devs);
- }
-}
-
void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)
{
btrfs_reset_fs_info_ptr(fs_info);
@@ -1076,6 +1046,36 @@ void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices,
/* /sys/fs/btrfs/ entry */
static struct kset *btrfs_kset;
+static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
+{
+ if (fs_devs->devices_dir_kobj) {
+ kobject_del(fs_devs->devices_dir_kobj);
+ kobject_put(fs_devs->devices_dir_kobj);
+ fs_devs->devices_dir_kobj = NULL;
+ }
+
+ if (fs_devs->fsid_kobj.state_initialized) {
+ kobject_del(&fs_devs->fsid_kobj);
+ kobject_put(&fs_devs->fsid_kobj);
+ wait_for_completion(&fs_devs->kobj_unregister);
+ }
+}
+
+/* when fs_devs is NULL it will remove all fsid kobject */
+void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
+{
+ struct list_head *fs_uuids = btrfs_get_fs_uuids();
+
+ if (fs_devs) {
+ __btrfs_sysfs_remove_fsid(fs_devs);
+ return;
+ }
+
+ list_for_each_entry(fs_devs, fs_uuids, fs_list) {
+ __btrfs_sysfs_remove_fsid(fs_devs);
+ }
+}
+
/*
* Can be called by the device discovery thread.
* And parent can be specified for seed device
--
2.23.0
next prev parent reply other threads:[~2019-11-18 8:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 8:46 [PATCH 00/15] btrfs: sysfs, cleanups Anand Jain
2019-11-18 8:46 ` [PATCH 01/15] btrfs: sysfs, rename device_link add,remove functions Anand Jain
2019-11-18 8:46 ` [PATCH 02/15] btrfs: sysfs, rename btrfs_sysfs_add_device() Anand Jain
2019-11-18 8:46 ` [PATCH 03/15] btrfs: sysfs, rename btrfs_device member device_dir_kobj Anand Jain
2019-11-18 8:46 ` [PATCH 04/15] btrfs: sysfs, move declared struct near its use Anand Jain
2019-11-18 15:40 ` David Sterba
2019-11-18 8:46 ` Anand Jain [this message]
2019-11-19 9:24 ` [PATCH 05/15] btrfs: sysfs, move /sys/fs/btrfs/UUID related functions together Nikolay Borisov
2019-11-19 10:58 ` David Sterba
2019-11-20 5:56 ` Anand Jain
2019-11-22 17:48 ` David Sterba
2019-11-25 3:18 ` Anand Jain
2019-11-18 8:46 ` [PATCH 06/15] btrfs: sysfs, move add remove _mounted function together Anand Jain
2019-11-18 8:46 ` [PATCH 07/15] btrfs: sysfs, delete code in a comment Anand Jain
2019-11-18 15:39 ` David Sterba
2019-11-18 8:46 ` [PATCH 08/15] btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent Anand Jain
2019-11-18 8:46 ` [PATCH 09/15] btrfs: sysfs, merge btrfs_sysfs_add device_dir and fsid Anand Jain
2019-11-18 8:46 ` [PATCH 10/15] btrfs: volume, btrfs_free_stale_devices() cleanup unreachable code Anand Jain
2019-11-18 8:46 ` [PATCH 11/15] btrfs: sysfs, migrate fs_decvices::fsid_kobject to struct btrfs_fs_info Anand Jain
2019-11-18 8:46 ` [PATCH 12/15] btrfs: sysfs, unexport btrfs_sysfs_add_mounted() Anand Jain
2019-11-18 8:46 ` [PATCH 13/15] btrfs: sysfs, cleanup btrfs_sysfs_remove_fsid() Anand Jain
2019-11-18 8:46 ` [PATCH 14/15] btrfs: sysfs, merge btrfs_sysfs_remove_fsid() helper function Anand Jain
2019-11-18 8:46 ` [PATCH 15/15] btrfs: sysfs, unexport btrfs_sysfs_remove_mounted() Anand Jain
2019-11-18 15:45 ` [PATCH 00/15] btrfs: sysfs, cleanups David Sterba
2019-11-19 6:44 ` Anand Jain
2019-11-19 12:37 ` David Sterba
2019-11-20 6:44 ` Anand Jain
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=20191118084656.3089-6-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;
as well as URLs for NNTP newsgroup(s).