From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 14/27] Btrfs: sysfs: add pointer to access fs_info from fs_devices
Date: Fri, 20 Mar 2015 18:01:29 +0800 [thread overview]
Message-ID: <1426845702-6298-15-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1426845702-6298-1-git-send-email-anand.jain@oracle.com>
From: Anand Jain <Anand.Jain@oracle.com>
adds fs_info pointer with struct btrfs_fs_devices.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/sysfs.c | 4 ++++
fs/btrfs/volumes.c | 18 ++++++++++++++++++
fs/btrfs/volumes.h | 3 +++
3 files changed, 25 insertions(+)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index ac15fbb..95d6257 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -530,6 +530,8 @@ static void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
{
+ btrfs_reset_fs_info_ptr(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);
@@ -729,6 +731,8 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
struct btrfs_fs_devices *fs_devs = fs_info->fs_devices;
struct kobject *super_kobj = &fs_devs->super_kobj;
+ btrfs_set_fs_info_ptr(fs_info);
+
error = btrfs_sysfs_add_fsid(fs_devs, NULL);
if (error)
return error;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index c1b1038..033e56a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6688,3 +6688,21 @@ void btrfs_update_commit_device_bytes_used(struct btrfs_root *root,
}
unlock_chunks(root);
}
+
+void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info)
+{
+ struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
+ while (fs_devices) {
+ fs_devices->fs_info = fs_info;
+ fs_devices = fs_devices->seed;
+ }
+}
+
+void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info)
+{
+ struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
+ while (fs_devices) {
+ fs_devices->fs_info = NULL;
+ fs_devices = fs_devices->seed;
+ }
+}
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index d4586ac..e6514c7 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -254,6 +254,7 @@ struct btrfs_fs_devices {
*/
int rotating;
+ struct btrfs_fs_info *fs_info;
/* sysfs kobjects */
struct kobject super_kobj;
struct kobject *device_dir_kobj;
@@ -540,5 +541,7 @@ static inline void unlock_chunks(struct btrfs_root *root)
}
struct list_head *btrfs_get_fs_uuids(void);
+void btrfs_set_fs_info_ptr(struct btrfs_fs_info *fs_info);
+void btrfs_reset_fs_info_ptr(struct btrfs_fs_info *fs_info);
#endif
--
2.0.0.153.g79dcccc
next prev parent reply other threads:[~2015-03-20 10:04 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 10:01 [PATCH 00/27 V5] provide framework so that sysfs attributs from the fs_devices can be added Anand Jain
2015-03-20 10:01 ` [PATCH 01/27] export symbol kobject_move() Anand Jain
2015-03-20 10:01 ` [PATCH 02/27] Btrfs: sysfs: fix, btrfs_release_super_kobj() should to clean up the kobject data Anand Jain
2015-03-20 10:01 ` [PATCH 03/27] Btrfs: sysfs: fix, fs_info kobject_unregister has init_completion() twice Anand Jain
2015-03-20 10:01 ` [PATCH 04/27] Btrfs: sysfs: fix, undo sysfs device links Anand Jain
2015-03-20 10:01 ` [PATCH 05/27] Btrfs: sysfs: fix, kobject pointer clean up needed after kobject release Anand Jain
2015-03-20 10:01 ` [PATCH 06/27] Btrfc: sysfs: fix, check if device_dir_kobj is init before destroy Anand Jain
2015-03-20 10:01 ` [PATCH 07/27] Btrfs: sysfs: reorder the kobject creations Anand Jain
2015-03-20 10:01 ` [PATCH 08/27] Btrfs: sysfs: rename __btrfs_sysfs_remove_one to btrfs_sysfs_remove_fsid Anand Jain
2015-03-20 10:01 ` [PATCH 09/27] Btrfs: sysfs: introduce function btrfs_sysfs_add_fsid() to create sysfs fsid Anand Jain
2015-03-20 10:01 ` [PATCH 10/27] Btrfs: sysfs: let default_attrs be separate from the kset Anand Jain
2015-03-20 10:01 ` [PATCH 11/27] Btrfs: sysfs: separate device kobject and its attribute creation Anand Jain
2015-03-20 10:01 ` [PATCH 12/27] Btrfs: sysfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-03-20 10:01 ` [PATCH 13/27] Btrfs: introduce btrfs_get_fs_uuids to get fs_uuids Anand Jain
2015-03-20 10:01 ` Anand Jain [this message]
2015-03-20 10:01 ` [PATCH 15/27] Btrfs: sysfs: provide framework to remove all fsid sysfs kobject Anand Jain
2015-03-20 10:01 ` [PATCH 16/27] Btrfs: sysfs btrfs_kobj_add_device() pass fs_devices instead of fs_info Anand Jain
2015-03-20 10:01 ` [PATCH 17/27] Btrfs: sysfs btrfs_kobj_rm_device() " Anand Jain
2015-03-20 10:01 ` [PATCH 18/27] Btrfs: sysfs: make btrfs_sysfs_add_fsid() non static Anand Jain
2015-03-20 10:01 ` [PATCH 19/27] Btrfs: sysfs: make btrfs_sysfs_add_device() " Anand Jain
2015-03-20 10:01 ` [PATCH 20/27] Btrfs: sysfs: btrfs_sysfs_remove_fsid() make it " Anand Jain
2015-03-20 10:01 ` [PATCH 21/27] Btrfs: sysfs: separate kobject and attribute creation Anand Jain
2015-03-20 10:01 ` [PATCH 22/27] Btrfs: sysfs: add support to add parent for fsid Anand Jain
2015-03-20 10:01 ` [PATCH 23/27] Btrfs: sysfs: don't fail seeding for the sake of sysfs kobject issue Anand Jain
2015-03-20 10:01 ` [PATCH 24/27] Btrfs: free the stale device Anand Jain
2015-05-22 15:33 ` [PATCH v5.1 " Anand Jain
2015-05-27 11:34 ` David Sterba
2015-05-30 15:34 ` Anand Jain
2015-05-30 15:32 ` [PATCH v5.2 24/42] " Anand Jain
2015-06-17 13:10 ` [PATCH v5.3 24/27] " Anand Jain
2015-03-20 10:01 ` [PATCH 25/27] Btrfs: sysfs: add support to show replacing target in the sysfs Anand Jain
2015-03-20 10:01 ` [PATCH 26/27] Btrfs: sysfs: support seed devices in the sysfs layout Anand Jain
2015-03-20 10:01 ` [PATCH 27/27] Btrfs: create sys/fs/btrfs/fsid when scanned instead of when mounted Anand Jain
2015-04-07 8:08 ` [PATCH 00/27 V5] provide framework so that sysfs attributs from the fs_devices can be added Anand Jain
2015-05-05 13:51 ` David Sterba
2015-05-20 16:40 ` David Sterba
2015-05-21 14:48 ` Anand Jain
2015-05-21 15:14 ` 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=1426845702-6298-15-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.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).