From: Jeff Mahoney <jeffm@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Josef Bacik <jbacik@fusionio.com>
Subject: [PATCH 04/13] btrfs: publish per-super attributes in sysfs
Date: Fri, 01 Nov 2013 13:06:58 -0400 [thread overview]
Message-ID: <20131101172240.588892815@suse.com> (raw)
In-Reply-To: 20131101170654.164867629@suse.com
This patch adds per-super attributes to sysfs.
It doesn't publish any attributes yet, but does the proper lifetime
handling as well as the basic infrastructure to add new attributes.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
fs/btrfs/ctree.h | 2 ++
fs/btrfs/disk-io.c | 9 +++++++++
fs/btrfs/sysfs.c | 36 ++++++++++++++++++++++++++++++++++++
fs/btrfs/sysfs.h | 10 ++++++++++
4 files changed, 57 insertions(+)
--- a/fs/btrfs/ctree.h 2013-10-21 16:30:27.122204722 -0400
+++ b/fs/btrfs/ctree.h 2013-10-21 16:30:39.390053476 -0400
@@ -3771,6 +3771,8 @@ int btrfs_defrag_leaves(struct btrfs_tra
/* sysfs.c */
int btrfs_init_sysfs(void);
void btrfs_exit_sysfs(void);
+int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info);
+void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info);
/* xattr.c */
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
--- a/fs/btrfs/disk-io.c 2013-10-21 16:30:27.126204673 -0400
+++ b/fs/btrfs/disk-io.c 2013-10-21 16:30:39.394053427 -0400
@@ -49,6 +49,7 @@
#include "rcu-string.h"
#include "dev-replace.h"
#include "raid56.h"
+#include "sysfs.h"
#ifdef CONFIG_X86
#include <asm/cpufeature.h>
@@ -2751,6 +2752,12 @@ retry_root_backup:
btrfs_close_extra_devices(fs_info, fs_devices, 1);
+ ret = btrfs_sysfs_add_one(fs_info);
+ if (ret) {
+ pr_err("btrfs: failed to init sysfs interface: %d\n", ret);
+ goto fail_block_groups;
+ }
+
ret = btrfs_init_space_info(fs_info);
if (ret) {
printk(KERN_ERR "Failed to initial space info: %d\n", ret);
@@ -3618,6 +3625,8 @@ int close_ctree(struct btrfs_root *root)
btrfs_stop_all_workers(fs_info);
+ btrfs_sysfs_remove_one(fs_info);
+
del_fs_roots(fs_info);
free_root_pointers(fs_info, 1);
--- a/fs/btrfs/sysfs.c 2013-10-21 16:30:27.126204673 -0400
+++ b/fs/btrfs/sysfs.c 2013-10-21 16:30:39.394053427 -0400
@@ -28,6 +28,25 @@
#include "transaction.h"
#include "sysfs.h"
+static void btrfs_release_super_kobj(struct kobject *kobj);
+static struct kobj_type btrfs_ktype = {
+ .sysfs_ops = &kobj_sysfs_ops,
+ .release = btrfs_release_super_kobj,
+};
+
+static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj)
+{
+ if (kobj->ktype != &btrfs_ktype)
+ return NULL;
+ return container_of(kobj, struct btrfs_fs_info, super_kobj);
+}
+
+static void btrfs_release_super_kobj(struct kobject *kobj)
+{
+ struct btrfs_fs_info *fs_info = to_fs_info(kobj);
+ complete(&fs_info->kobj_unregister);
+}
+
static ssize_t btrfs_feature_attr_show(struct kobject *kobj,
struct kobj_attribute *a, char *buf)
{
@@ -65,6 +84,23 @@ static const struct attribute_group btrf
/* /sys/fs/btrfs/ entry */
static struct kset *btrfs_kset;
+void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
+{
+ kobject_del(&fs_info->super_kobj);
+ kobject_put(&fs_info->super_kobj);
+ wait_for_completion(&fs_info->kobj_unregister);
+}
+
+int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
+{
+ int error;
+
+ init_completion(&fs_info->kobj_unregister);
+ error = kobject_init_and_add(&fs_info->super_kobj, &btrfs_ktype, NULL,
+ "%pU", fs_info->fsid);
+ return error;
+}
+
int btrfs_init_sysfs(void)
{
int ret;
--- a/fs/btrfs/sysfs.h 2013-10-21 16:30:27.126204673 -0400
+++ b/fs/btrfs/sysfs.h 2013-10-21 16:30:39.394053427 -0400
@@ -15,6 +15,13 @@ enum btrfs_feature_set {
.store = _store, \
}
+#define BTRFS_ATTR_RW(_name, _mode, _show, _store) \
+static struct kobj_attribute btrfs_attr_##_name = \
+ __INIT_KOBJ_ATTR(_name, _mode, _show, _store)
+#define BTRFS_ATTR(_name, _mode, _show) \
+ BTRFS_ATTR_RW(_name, _mode, _show, NULL)
+#define BTRFS_ATTR_PTR(_name) (&btrfs_attr_##_name.attr)
+
struct btrfs_feature_attr {
struct kobj_attribute kobj_attr;
enum btrfs_feature_set feature_set;
@@ -40,4 +47,7 @@ static struct btrfs_feature_attr btrfs_a
/* convert from attribute */
#define to_btrfs_feature_attr(a) \
container_of(a, struct btrfs_feature_attr, kobj_attr)
+#define attr_to_btrfs_attr(a) container_of(a, struct kobj_attribute, attr)
+#define attr_to_btrfs_feature_attr(a) \
+ to_btrfs_feature_attr(attr_to_btrfs_attr(a))
#endif /* _BTRFS_SYSFS_H_ */
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 ` Jeff Mahoney [this message]
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 ` [PATCH 11/13] btrfs: publish device membership " Jeff Mahoney
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:33 ` [PATCH 04/13] btrfs: publish per-super attributes in sysfs Jeff Mahoney
2013-10-21 21:19 [patch 00/13] sysfs publishing patchset Jeff Mahoney
2013-10-21 21:19 ` [patch 04/13] btrfs: publish per-super attributes 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=20131101172240.588892815@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).