From: Jeff Mahoney <jeffm@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Josef Bacik <jbacik@fusionio.com>
Subject: [PATCH 11/13] btrfs: publish device membership in sysfs
Date: Fri, 01 Nov 2013 13:07:05 -0400 [thread overview]
Message-ID: <20131101172241.568825841@suse.com> (raw)
In-Reply-To: 20131101170654.164867629@suse.com
Now that we have the infrastructure for per-super attributes, we can
publish device membership in /sys/fs/btrfs/<fsid>/devices. The information
is published as symlinks to the block devices.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
fs/btrfs/ctree.h | 1 +
fs/btrfs/sysfs.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
--- a/fs/btrfs/ctree.h 2013-10-21 16:10:02.743982088 -0400
+++ b/fs/btrfs/ctree.h 2013-10-21 16:10:03.223971538 -0400
@@ -1522,6 +1522,7 @@ struct btrfs_fs_info {
struct kobject super_kobj;
struct kobject *space_info_kobj;
+ struct kobject *device_dir_kobj;
struct completion kobj_unregister;
int do_barriers;
int closing;
--- a/fs/btrfs/sysfs.c 2013-10-21 16:10:02.751981911 -0400
+++ b/fs/btrfs/sysfs.c 2013-10-21 16:10:03.227971451 -0400
@@ -23,11 +23,13 @@
#include <linux/buffer_head.h>
#include <linux/kobject.h>
#include <linux/bug.h>
+#include <linux/genhd.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
#include "sysfs.h"
+#include "volumes.h"
static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj);
@@ -374,6 +376,8 @@ static inline struct btrfs_fs_info *to_f
void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
{
sysfs_remove_files(fs_info->space_info_kobj, allocation_attrs);
+ kobject_del(fs_info->device_dir_kobj);
+ kobject_put(fs_info->device_dir_kobj);
kobject_del(fs_info->space_info_kobj);
kobject_put(fs_info->space_info_kobj);
kobject_del(&fs_info->super_kobj);
@@ -507,6 +511,30 @@ static int add_unknown_feature_attrs(str
return 0;
}
+static int add_device_membership(struct btrfs_fs_info *fs_info)
+{
+ int error = 0;
+ struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
+ struct btrfs_device *dev;
+
+ fs_info->device_dir_kobj = kobject_create_and_add("devices",
+ &fs_info->super_kobj);
+ if (!fs_info->device_dir_kobj)
+ return -ENOMEM;
+
+ list_for_each_entry(dev, &fs_devices->devices, dev_list) {
+ struct hd_struct *disk = dev->bdev->bd_part;
+ struct kobject *disk_kobj = &part_to_dev(disk)->kobj;
+
+ error = sysfs_create_link(fs_info->device_dir_kobj,
+ disk_kobj, disk_kobj->name);
+ if (error)
+ break;
+ }
+
+ return error;
+}
+
/* /sys/fs/btrfs/ entry */
static struct kset *btrfs_kset;
@@ -528,6 +556,10 @@ int btrfs_sysfs_add_one(struct btrfs_fs_
if (error)
goto failure;
+ error = add_device_membership(fs_info);
+ if (error)
+ goto failure;
+
fs_info->space_info_kobj = kobject_create_and_add("allocation",
&fs_info->super_kobj);
if (!fs_info->space_info_kobj) {
next prev parent reply other threads:[~2013-11-01 17:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 17:06 [PATCH 00/13] [PATCH 00/13] sysfs publishing patchset (v2) Jeff Mahoney
2013-11-01 17:06 ` [PATCH 01/13] btrfs: add ioctls to query/change feature bits online Jeff Mahoney
2013-11-01 20:56 ` Zach Brown
2013-11-03 22:02 ` Jeff Mahoney
2013-11-01 17:06 ` [PATCH 02/13] kobject: export kobj_sysfs_ops Jeff Mahoney
2013-11-01 17:06 ` [PATCH 03/13] btrfs: publish supported featured in sysfs Jeff Mahoney
2013-11-01 17:06 ` [PATCH 04/13] btrfs: publish per-super attributes " Jeff Mahoney
2013-11-01 17:06 ` [PATCH 05/13] btrfs: publish per-super features " Jeff Mahoney
2013-11-01 17:07 ` [PATCH 06/13] btrfs: publish unknown feature bits " Jeff Mahoney
2013-11-01 17:07 ` [PATCH 07/13] btrfs: add ability to change features via sysfs Jeff Mahoney
2013-11-01 17:07 ` [PATCH 08/13] btrfs: use feature attribute names to print better error messages Jeff Mahoney
2013-11-01 17:07 ` [PATCH 09/13] btrfs: add ioctl to export size of global metadata reservation Jeff Mahoney
2013-11-01 17:07 ` [PATCH 10/13] btrfs: publish allocation data in sysfs Jeff Mahoney
2013-11-01 17:07 ` Jeff Mahoney [this message]
2013-11-01 17:07 ` [PATCH 12/13] btrfs: publish fs label " Jeff Mahoney
2013-11-01 17:07 ` [PATCH 13/13] btrfs: add tracing for failed reservations Jeff Mahoney
2013-11-06 17:02 ` [PATCH 00/13] [PATCH 00/13] sysfs publishing patchset (v2) David Sterba
2013-11-06 17:08 ` Jeff Mahoney
2013-11-06 17:09 ` David Sterba
-- strict thread matches above, loose matches on Subject: below --
2013-11-15 20:33 [PATCH 00/13] sysfs publishing patchset (v3) Jeff Mahoney
2013-11-15 20:34 ` [PATCH 11/13] btrfs: publish device membership in sysfs Jeff Mahoney
2013-10-21 21:19 [patch 00/13] sysfs publishing patchset Jeff Mahoney
2013-10-21 21:19 ` [patch 11/13] btrfs: publish device membership in sysfs Jeff Mahoney
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=20131101172241.568825841@suse.com \
--to=jeffm@suse.com \
--cc=jbacik@fusionio.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).