From: Jeff Mahoney <jeffm@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Josef Bacik <jbacik@fusionio.com>
Subject: [PATCH 05/13] btrfs: publish per-super features in sysfs
Date: Fri, 01 Nov 2013 13:06:59 -0400 [thread overview]
Message-ID: <20131101172240.734532613@suse.com> (raw)
In-Reply-To: 20131101170654.164867629@suse.com
This patch publishes information on which features are enabled in the
file system on a per-super basis. At this point, it only publishes
information on features supported by the file system implementation.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
fs/btrfs/sysfs.c | 81 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 65 insertions(+), 16 deletions(-)
--- a/fs/btrfs/sysfs.c 2013-10-21 16:10:00.216037635 -0400
+++ b/fs/btrfs/sysfs.c 2013-10-21 16:10:00.700027002 -0400
@@ -28,29 +28,53 @@
#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);
-static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj)
+static u64 get_features(struct btrfs_fs_info *fs_info,
+ enum btrfs_feature_set set)
{
- if (kobj->ktype != &btrfs_ktype)
- return NULL;
- return container_of(kobj, struct btrfs_fs_info, super_kobj);
+ struct btrfs_super_block *disk_super = fs_info->super_copy;
+ if (set == FEAT_COMPAT)
+ return btrfs_super_compat_flags(disk_super);
+ else if (set == FEAT_COMPAT_RO)
+ return btrfs_super_compat_ro_flags(disk_super);
+ else
+ return btrfs_super_incompat_flags(disk_super);
}
-static void btrfs_release_super_kobj(struct kobject *kobj)
+static ssize_t btrfs_feature_attr_show(struct kobject *kobj,
+ struct kobj_attribute *a, char *buf)
{
+ int val = 0;
struct btrfs_fs_info *fs_info = to_fs_info(kobj);
- complete(&fs_info->kobj_unregister);
+ if (fs_info) {
+ struct btrfs_feature_attr *fa = to_btrfs_feature_attr(a);
+ u64 features = get_features(fs_info, fa->feature_set);
+ if (features & fa->feature_bit)
+ val = 1;
+ }
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", val);
}
-static ssize_t btrfs_feature_attr_show(struct kobject *kobj,
- struct kobj_attribute *a, char *buf)
+static umode_t btrfs_feature_visible(struct kobject *kobj,
+ struct attribute *attr, int unused)
{
- return snprintf(buf, PAGE_SIZE, "0\n");
+ struct btrfs_fs_info *fs_info = to_fs_info(kobj);
+ umode_t mode = attr->mode;
+
+ if (fs_info) {
+ struct btrfs_feature_attr *fa;
+ u64 features;
+
+ fa = attr_to_btrfs_feature_attr(attr);
+ features = get_features(fs_info, fa->feature_set);
+
+ if (!(features & fa->feature_bit))
+ mode = 0;
+ }
+
+ return mode;
}
BTRFS_FEAT_ATTR_INCOMPAT(mixed_backref, MIXED_BACKREF);
@@ -78,11 +102,27 @@ static struct attribute *btrfs_supported
static const struct attribute_group btrfs_feature_attr_group = {
.name = "features",
+ .is_visible = btrfs_feature_visible,
.attrs = btrfs_supported_feature_attrs,
};
-/* /sys/fs/btrfs/ entry */
-static struct kset *btrfs_kset;
+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 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);
+}
void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
{
@@ -91,13 +131,22 @@ void btrfs_sysfs_remove_one(struct btrfs
wait_for_completion(&fs_info->kobj_unregister);
}
+/* /sys/fs/btrfs/ entry */
+static struct kset *btrfs_kset;
+
int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
{
int error;
init_completion(&fs_info->kobj_unregister);
+ fs_info->super_kobj.kset = btrfs_kset;
error = kobject_init_and_add(&fs_info->super_kobj, &btrfs_ktype, NULL,
"%pU", fs_info->fsid);
+
+ error = sysfs_create_group(&fs_info->super_kobj,
+ &btrfs_feature_attr_group);
+ if (error)
+ btrfs_sysfs_remove_one(fs_info);
return error;
}
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 ` Jeff Mahoney [this message]
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 05/13] btrfs: publish per-super features in sysfs Jeff Mahoney
2013-10-21 21:19 [patch 00/13] sysfs publishing patchset Jeff Mahoney
2013-10-21 21:19 ` [patch 05/13] btrfs: publish per-super features 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.734532613@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.