Merge tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux.git] / fs / btrfs / sysfs.c

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 2f078b77fe145937fada488e43eb7a12cc79161e..9539f8143b7a5c2d433184536a049948fc8bcdb4 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -16,6 +16,7 @@
 #include "transaction.h"
 #include "sysfs.h"
 #include "volumes.h"
+#include "space-info.h"
 
 static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj);
 static inline struct btrfs_fs_devices *to_fs_devs(struct kobject *kobj);
@@ -303,11 +304,12 @@ static ssize_t raid_bytes_show(struct kobject *kobj,
        return snprintf(buf, PAGE_SIZE, "%llu\n", val);
 }
 
-static struct attribute *raid_attributes[] = {
+static struct attribute *raid_attrs[] = {
        BTRFS_ATTR_PTR(raid, total_bytes),
        BTRFS_ATTR_PTR(raid, used_bytes),
        NULL
 };
+ATTRIBUTE_GROUPS(raid);
 
 static void release_raid_kobj(struct kobject *kobj)
 {
@@ -317,7 +319,7 @@ static void release_raid_kobj(struct kobject *kobj)
 struct kobj_type btrfs_raid_ktype = {
        .sysfs_ops = &kobj_sysfs_ops,
        .release = release_raid_kobj,
-       .default_attrs = raid_attributes,
+       .default_groups = raid_groups,
 };
 
 #define SPACE_INFO_ATTR(field)                                         \
@@ -364,6 +366,7 @@ static struct attribute *space_info_attrs[] = {
        BTRFS_ATTR_PTR(space_info, total_bytes_pinned),
        NULL,
 };
+ATTRIBUTE_GROUPS(space_info);
 
 static void space_info_release(struct kobject *kobj)
 {
@@ -375,7 +378,7 @@ static void space_info_release(struct kobject *kobj)
 struct kobj_type space_info_ktype = {
        .sysfs_ops = &kobj_sysfs_ops,
        .release = space_info_release,
-       .default_attrs = space_info_attrs,
+       .default_groups = space_info_groups,
 };
 
 static const struct attribute *allocation_attrs[] = {
@@ -910,12 +913,10 @@ void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info,
        ret = sysfs_create_group(fsid_kobj, &btrfs_feature_attr_group);
 }
 
-static int btrfs_init_debugfs(void)
+static void btrfs_init_debugfs(void)
 {
 #ifdef CONFIG_DEBUG_FS
        btrfs_debugfs_root_dentry = debugfs_create_dir("btrfs", NULL);
-       if (!btrfs_debugfs_root_dentry)
-               return -ENOMEM;
 
        /*
         * Example code, how to export data through debugfs.
@@ -929,7 +930,6 @@ static int btrfs_init_debugfs(void)
 #endif
 
 #endif
-       return 0;
 }
 
 int __init btrfs_init_sysfs(void)
@@ -940,9 +940,7 @@ int __init btrfs_init_sysfs(void)
        if (!btrfs_kset)
                return -ENOMEM;
 
-       ret = btrfs_init_debugfs();
-       if (ret)
-               goto out1;
+       btrfs_init_debugfs();
 
        init_feature_attrs();
        ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
@@ -959,7 +957,6 @@ int __init btrfs_init_sysfs(void)
        sysfs_remove_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
 out2:
        debugfs_remove_recursive(btrfs_debugfs_root_dentry);
-out1:
        kset_unregister(btrfs_kset);
 
        return ret;