btrfs: sysfs: move helper macros to sysfs.c

None of the macros is used outside of sysfs.c.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 89781d94164518eaa897c3ed19f8fd7e4eb9e821..f6d3c80f2e289535fd7e32f47e03f33fdd4d1344 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -18,6 +18,54 @@
 #include "space-info.h"
 #include "block-group.h"
 
+struct btrfs_feature_attr {
+       struct kobj_attribute kobj_attr;
+       enum btrfs_feature_set feature_set;
+       u64 feature_bit;
+};
+
+/* For raid type sysfs entries */
+struct raid_kobject {
+       u64 flags;
+       struct kobject kobj;
+};
+
+#define __INIT_KOBJ_ATTR(_name, _mode, _show, _store)                  \
+{                                                                      \
+       .attr   = { .name = __stringify(_name), .mode = _mode },        \
+       .show   = _show,                                                \
+       .store  = _store,                                               \
+}
+
+#define BTRFS_ATTR_RW(_prefix, _name, _show, _store)                   \
+       static struct kobj_attribute btrfs_attr_##_prefix##_##_name =   \
+                       __INIT_KOBJ_ATTR(_name, 0644, _show, _store)
+
+#define BTRFS_ATTR(_prefix, _name, _show)                              \
+       static struct kobj_attribute btrfs_attr_##_prefix##_##_name =   \
+                       __INIT_KOBJ_ATTR(_name, 0444, _show, NULL)
+
+#define BTRFS_ATTR_PTR(_prefix, _name)                                 \
+       (&btrfs_attr_##_prefix##_##_name.attr)
+
+#define BTRFS_FEAT_ATTR(_name, _feature_set, _feature_prefix, _feature_bit)  \
+static struct btrfs_feature_attr btrfs_attr_features_##_name = {            \
+       .kobj_attr = __INIT_KOBJ_ATTR(_name, S_IRUGO,                        \
+                                     btrfs_feature_attr_show,               \
+                                     btrfs_feature_attr_store),             \
+       .feature_set    = _feature_set,                                      \
+       .feature_bit    = _feature_prefix ##_## _feature_bit,                \
+}
+#define BTRFS_FEAT_ATTR_PTR(_name)                                          \
+       (&btrfs_attr_features_##_name.kobj_attr.attr)
+
+#define BTRFS_FEAT_ATTR_COMPAT(name, feature) \
+       BTRFS_FEAT_ATTR(name, FEAT_COMPAT, BTRFS_FEATURE_COMPAT, feature)
+#define BTRFS_FEAT_ATTR_COMPAT_RO(name, feature) \
+       BTRFS_FEAT_ATTR(name, FEAT_COMPAT_RO, BTRFS_FEATURE_COMPAT_RO, feature)
+#define BTRFS_FEAT_ATTR_INCOMPAT(name, feature) \
+       BTRFS_FEAT_ATTR(name, FEAT_INCOMPAT, BTRFS_FEATURE_INCOMPAT, feature)
+
 static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj);
 static inline struct btrfs_fs_devices *to_fs_devs(struct kobject *kobj);
 

diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index eaa37bd4013af0a871cabae2cd152aa8ecfac1c6..610e9c36a94cd17423b388598b7be1dbe1e0ce53 100644 (file)
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -12,55 +12,6 @@ enum btrfs_feature_set {
        FEAT_MAX
 };
 
-#define __INIT_KOBJ_ATTR(_name, _mode, _show, _store)                  \
-{                                                                      \
-       .attr   = { .name = __stringify(_name), .mode = _mode },        \
-       .show   = _show,                                                \
-       .store  = _store,                                               \
-}
-
-#define BTRFS_ATTR_RW(_prefix, _name, _show, _store)                   \
-       static struct kobj_attribute btrfs_attr_##_prefix##_##_name =   \
-                       __INIT_KOBJ_ATTR(_name, 0644, _show, _store)
-
-#define BTRFS_ATTR(_prefix, _name, _show)                              \
-       static struct kobj_attribute btrfs_attr_##_prefix##_##_name =   \
-                       __INIT_KOBJ_ATTR(_name, 0444, _show, NULL)
-
-#define BTRFS_ATTR_PTR(_prefix, _name)                                 \
-       (&btrfs_attr_##_prefix##_##_name.attr)
-
-
-struct btrfs_feature_attr {
-       struct kobj_attribute kobj_attr;
-       enum btrfs_feature_set feature_set;
-       u64 feature_bit;
-};
-
-/* For raid type sysfs entries */
-struct raid_kobject {
-       u64 flags;
-       struct kobject kobj;
-};
-
-#define BTRFS_FEAT_ATTR(_name, _feature_set, _feature_prefix, _feature_bit)  \
-static struct btrfs_feature_attr btrfs_attr_features_##_name = {            \
-       .kobj_attr = __INIT_KOBJ_ATTR(_name, S_IRUGO,                        \
-                                     btrfs_feature_attr_show,               \
-                                     btrfs_feature_attr_store),             \
-       .feature_set    = _feature_set,                                      \
-       .feature_bit    = _feature_prefix ##_## _feature_bit,                \
-}
-#define BTRFS_FEAT_ATTR_PTR(_name)                                          \
-       (&btrfs_attr_features_##_name.kobj_attr.attr)
-
-#define BTRFS_FEAT_ATTR_COMPAT(name, feature) \
-       BTRFS_FEAT_ATTR(name, FEAT_COMPAT, BTRFS_FEATURE_COMPAT, feature)
-#define BTRFS_FEAT_ATTR_COMPAT_RO(name, feature) \
-       BTRFS_FEAT_ATTR(name, FEAT_COMPAT_RO, BTRFS_FEATURE_COMPAT_RO, feature)
-#define BTRFS_FEAT_ATTR_INCOMPAT(name, feature) \
-       BTRFS_FEAT_ATTR(name, FEAT_INCOMPAT, BTRFS_FEATURE_INCOMPAT, feature)
-
 char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);
 const char * const btrfs_feature_set_name(enum btrfs_feature_set set);
 int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,