From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 15/26] Btrfs: sysfs btrfs_kobj_add_device() pass fs_devices instead of fs_info
Date: Tue, 10 Mar 2015 06:38:33 +0800 [thread overview]
Message-ID: <1425940724-7744-16-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1425940724-7744-1-git-send-email-anand.jain@oracle.com>
btrfs_kobj_add_device() does not need fs_info any more.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/dev-replace.c | 2 +-
fs/btrfs/sysfs.c | 7 +++----
fs/btrfs/sysfs.h | 2 +-
fs/btrfs/volumes.c | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index ca6a3a3..2acc0aa 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -593,7 +593,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
/* replace the sysfs entry */
btrfs_kobj_rm_device(fs_info, src_device);
- btrfs_kobj_add_device(fs_info, tgt_device);
+ btrfs_kobj_add_device(fs_info->fs_devices, tgt_device);
btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);
/* write back the superblocks */
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index a8ee136..76afc96 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -682,11 +682,10 @@ int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs)
return 0;
}
-int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,
- struct btrfs_device *one_device)
+int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,
+ struct btrfs_device *one_device)
{
int error = 0;
- struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
struct btrfs_device *dev;
error = btrfs_sysfs_add_device(fs_devices);
@@ -752,7 +751,7 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
if (error)
return error;
- error = btrfs_kobj_add_device(fs_info, NULL);
+ error = btrfs_kobj_add_device(fs_devs, NULL);
if (error) {
btrfs_sysfs_remove_fsid(fs_devs);
return error;
diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index f7dd298..eeb86a8 100644
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -70,7 +70,7 @@ char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);
extern const char * const btrfs_feature_set_names[3];
extern struct kobj_type space_info_ktype;
extern struct kobj_type btrfs_raid_ktype;
-int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,
+int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device);
int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
struct btrfs_device *one_device);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 033e56a..ee318af 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2206,7 +2206,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
tmp + 1);
/* add sysfs device entry */
- btrfs_kobj_add_device(root->fs_info, device);
+ btrfs_kobj_add_device(root->fs_info->fs_devices, device);
/*
* we've got more storage, clear any full flags on the space
--
2.0.0.153.g79dcccc
next prev parent reply other threads:[~2015-03-09 17:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 22:38 [PATCH 00/26 v4] provide framework so that sysfs attributs from the fs_devices can be added Anand Jain
2015-03-09 22:38 ` [PATCH 01/26] Btrfs: sysfs: fix, btrfs_release_super_kobj() should to clean up the kobject data Anand Jain
2015-03-09 22:38 ` [PATCH 02/26] Btrfs: sysfs: fix, fs_info kobject_unregister has init_completion() twice Anand Jain
2015-03-09 22:38 ` [PATCH 03/26] Btrfs: sysfs: fix, undo sysfs device links Anand Jain
2015-03-09 22:38 ` [PATCH 04/26] Btrfs: sysfs: fix, kobject pointer clean up needed after kobject release Anand Jain
2015-03-09 22:38 ` [PATCH 05/26] Btrfc: sysfs: fix, check if device_dir_kobj is init before destroy Anand Jain
2015-03-09 22:38 ` [PATCH 06/26] Btrfs: sysfs: reorder the kobject creations Anand Jain
2015-03-09 22:38 ` [PATCH 07/26] Btrfs: sysfs: rename __btrfs_sysfs_remove_one to btrfs_sysfs_remove_fsid Anand Jain
2015-03-09 22:38 ` [PATCH 08/26] Btrfs: sysfs: introduce function btrfs_sysfs_add_fsid() to create sysfs fsid Anand Jain
2015-03-09 22:38 ` [PATCH 09/26] Btrfs: sysfs: let default_attrs be separate from the kset Anand Jain
2015-03-09 22:38 ` [PATCH 10/26] Btrfs: sysfs: separate device kobject and its attribute creation Anand Jain
2015-03-09 22:38 ` [PATCH 11/26] Btrfs: sysfs: move super_kobj and device_dir_kobj from fs_info to btrfs_fs_devices Anand Jain
2015-03-09 22:38 ` [PATCH 12/26] Btrfs: introduce btrfs_get_fs_uuids to get fs_uuids v2 Anand Jain
2015-03-09 22:38 ` [PATCH 13/26] Btrfs: sysfs: add pointer to access fs_info from fs_devices v2 Anand Jain
2015-03-09 22:38 ` [PATCH 14/26] Btrfs: sysfs: provide framework to remove all fsid sysfs kobject v2 Anand Jain
2015-03-09 22:38 ` Anand Jain [this message]
2015-03-09 22:38 ` [PATCH 16/26] Btrfs: sysfs btrfs_kobj_rm_device() pass fs_devices instead of fs_info Anand Jain
2015-03-09 22:38 ` [PATCH 17/26] Btrfs: sysfs: make btrfs_sysfs_add_fsid() non static Anand Jain
2015-03-09 22:38 ` [PATCH 18/26] Btrfs: sysfs: make btrfs_sysfs_add_device() " Anand Jain
2015-03-09 22:38 ` [PATCH 19/26] Btrfs: sysfs: btrfs_sysfs_remove_fsid() make it " Anand Jain
2015-03-09 22:38 ` [PATCH 20/26] Btrfs: sysfs: separate kobject and attribute creation Anand Jain
2015-03-09 22:38 ` [PATCH 21/26] Btrfs: sysfs: add support to add parent for fsid Anand Jain
2015-03-09 22:38 ` [PATCH 22/26] Btrfs: sysfs: don't fail seeding for the sake of sysfs kobject issue v2 Anand Jain
2015-03-09 22:38 ` [PATCH 23/26] Btrfs: free the stale device Anand Jain
2015-03-09 22:38 ` [PATCH 24/26] Btrfs: sysfs: add support to show replacing target in the sysfs Anand Jain
2015-03-09 22:38 ` [PATCH 25/26] Btrfs: sysfs: support seed devices in the sysfs layout v3 Anand Jain
2015-03-19 18:55 ` David Sterba
2015-03-20 1:58 ` Anand Jain
2015-03-09 22:38 ` [PATCH 26/26] Btrfs: create sys/fs/btrfs/fsid when scanned instead of when mounted Anand Jain
2015-03-19 18:58 ` [PATCH 00/26 v4] provide framework so that sysfs attributs from the fs_devices can be added David Sterba
2015-03-20 10:03 ` 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=1425940724-7744-16-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).