From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz, clm@fb.com
Subject: [PATCH 07/12] Btrfs: sysfs: rename __btrfs_sysfs_remove_one to btrfs_sysfs_remove_fsid
Date: Sun, 1 Feb 2015 16:01:37 +0800 [thread overview]
Message-ID: <1422777702-12584-8-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1422777702-12584-1-git-send-email-anand.jain@oracle.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/sysfs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index c3e7f06..c923e8b 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -508,7 +508,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
return 0;
}
-static void __btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
+static void btrfs_sysfs_remove_fsid(struct btrfs_fs_info *fs_info)
{
if (fs_info->device_dir_kobj) {
btrfs_kobj_rm_device(fs_info, NULL);
@@ -531,7 +531,7 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
}
addrm_unknown_feature_attrs(fs_info, false);
sysfs_remove_group(&fs_info->super_kobj, &btrfs_feature_attr_group);
- __btrfs_sysfs_remove_one(fs_info);
+ btrfs_sysfs_remove_fsid(fs_info);
}
const char * const btrfs_feature_set_names[3] = {
@@ -703,14 +703,14 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
error = btrfs_kobj_add_device(fs_info, NULL);
if (error) {
- __btrfs_sysfs_remove_one(fs_info);
+ btrfs_sysfs_remove_fsid(fs_info);
return error;
}
error = sysfs_create_group(&fs_info->super_kobj,
&btrfs_feature_attr_group);
if (error) {
- __btrfs_sysfs_remove_one(fs_info);
+ btrfs_sysfs_remove_fsid(fs_info);
return error;
}
--
1.9.1
next prev parent reply other threads:[~2015-02-01 8:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 16:02 [PATCH 1/1] Btrfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-01-23 16:35 ` David Sterba
2015-01-24 13:42 ` Anand Jain
2015-01-26 1:59 ` [PATCH 1/1] Btrfs: btrfs_release_super_kobj() should clean up the kobject data Anand Jain
2015-01-26 10:07 ` [PATCH 1/1] Btrfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-02-01 8:01 ` [PATCH 00/12] provide frame work so that sysfs attributs from the fs_devices can be added Anand Jain
2015-02-01 8:01 ` [PATCH 01/12] Btrfs: sysfs: fix, btrfs_release_super_kobj() should to clean up the kobject data Anand Jain
2015-02-01 8:01 ` [PATCH 02/12] Btrfs: sysfs: fix, fs_info kobject_unregister has init_completion() twice Anand Jain
2015-02-01 8:01 ` [PATCH 03/12] Btrfs: sysfs: fix, undo sysfs device links Anand Jain
2015-02-01 8:01 ` [PATCH 04/12] Btrfs: sysfs: fix, kobject pointer clean up needed after kobject release Anand Jain
2015-02-01 8:01 ` [PATCH 05/12] Btrfc: sysfs: fix, check if device_dir_kobj is init before destroy Anand Jain
2015-02-01 8:01 ` [PATCH 06/12] Btrfs: sysfs: reorder the kobject creations Anand Jain
2015-02-01 8:01 ` Anand Jain [this message]
2015-02-01 8:01 ` [PATCH 08/12] Btrfs: sysfs: introduce function btrfs_sysfs_add_fsid() to create sysfs fsid Anand Jain
2015-02-01 8:01 ` [PATCH 09/12] Btrfs: sysfs: let default_attrs be separate from the kset Anand Jain
2015-02-01 8:01 ` [PATCH 10/12] Btrfs: sysfs: separate device kobject and its attribute creation Anand Jain
2015-02-01 8:01 ` [PATCH 11/12] Btrfs: sysfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-02-01 8:01 ` [PATCH 12/12] Btrfs: sysfs: add pointer to access fs_info from fs_devices Anand Jain
2015-02-01 8:02 ` [PATCH] Btrfs-progs: add regression tests for sysfs contents during btrfs device management 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=1422777702-12584-8-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--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).