diff options
| author | David Sterba <dsterba@suse.com> | 2019-08-02 14:07:38 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-09-09 15:59:08 +0300 |
| commit | 8f52316c271a572ef602e0b463d9d60d0f40276c (patch) | |
| tree | c027f0a9214f590fb84ad13b713530f7a6e9a6a3 /fs/btrfs | |
| parent | 67715b206c397b28b8a41c9ddbdc1776a0e7a25f (diff) | |
| download | linux-8f52316c271a572ef602e0b463d9d60d0f40276c.tar.xz | |
btrfs: sysfs: move type conversion helpers to sysfs.c
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/sysfs.c | 16 | ||||
| -rw-r--r-- | fs/btrfs/sysfs.h | 18 |
2 files changed, 16 insertions, 18 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 85cf3bfc9f62..89781d941645 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -21,6 +21,22 @@ static inline struct btrfs_fs_info *to_fs_info(struct kobject *kobj); static inline struct btrfs_fs_devices *to_fs_devs(struct kobject *kobj); +static struct btrfs_feature_attr *to_btrfs_feature_attr(struct kobj_attribute *a) +{ + return container_of(a, struct btrfs_feature_attr, kobj_attr); +} + +static struct kobj_attribute *attr_to_btrfs_attr(struct attribute *attr) +{ + return container_of(attr, struct kobj_attribute, attr); +} + +static struct btrfs_feature_attr *attr_to_btrfs_feature_attr( + struct attribute *attr) +{ + return to_btrfs_feature_attr(attr_to_btrfs_attr(attr)); +} + static u64 get_features(struct btrfs_fs_info *fs_info, enum btrfs_feature_set set) { diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index 611e103c174b..eaa37bd4013a 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h @@ -61,24 +61,6 @@ static struct btrfs_feature_attr btrfs_attr_features_##_name = { \ #define BTRFS_FEAT_ATTR_INCOMPAT(name, feature) \ BTRFS_FEAT_ATTR(name, FEAT_INCOMPAT, BTRFS_FEATURE_INCOMPAT, feature) -/* convert from attribute */ -static inline struct btrfs_feature_attr * -to_btrfs_feature_attr(struct kobj_attribute *a) -{ - return container_of(a, struct btrfs_feature_attr, kobj_attr); -} - -static inline struct kobj_attribute *attr_to_btrfs_attr(struct attribute *attr) -{ - return container_of(attr, struct kobj_attribute, attr); -} - -static inline struct btrfs_feature_attr * -attr_to_btrfs_feature_attr(struct attribute *attr) -{ - return to_btrfs_feature_attr(attr_to_btrfs_attr(attr)); -} - 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, |