OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs: move sysfs declarations out of ctree.h 

As the header for sysfs code already exists, use it to clean up ctree.h.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-08-01 17:34:41 +02:00
parent ae4b9b4c7d
commit 89439109bc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/ctree.h
View File

@ -398,12 +398,6 @@ struct btrfs_dev_replace {
wait_queue_head_t replace_wait; wait_queue_head_t replace_wait;
}; };
/* For raid type sysfs entries */
struct raid_kobject {
u64 flags;
struct kobject kobj;
};
/* /*
* free clusters are used to claim free space in relatively large chunks, * free clusters are used to claim free space in relatively large chunks,
* allowing us to do less seeky writes. They are used for all metadata * allowing us to do less seeky writes. They are used for all metadata
@ -3096,12 +3090,6 @@ loff_t btrfs_remap_file_range(struct file *file_in, loff_t pos_in,
int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
struct btrfs_root *root); struct btrfs_root *root);
/* sysfs.c */
int __init btrfs_init_sysfs(void);
void __cold btrfs_exit_sysfs(void);
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);
void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);
/* super.c */ /* super.c */
int btrfs_parse_options(struct btrfs_fs_info *info, char *options, int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
unsigned long new_flags); unsigned long new_flags);

1
fs/btrfs/super.c
View File

@ -43,6 +43,7 @@
#include "free-space-cache.h" #include "free-space-cache.h"
#include "backref.h" #include "backref.h"
#include "space-info.h" #include "space-info.h"
#include "sysfs.h"
#include "tests/btrfs-tests.h" #include "tests/btrfs-tests.h"
#include "block-group.h" #include "block-group.h"

11
fs/btrfs/sysfs.h
View File

@ -35,6 +35,12 @@ struct btrfs_feature_attr {
u64 feature_bit; 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) \ #define BTRFS_FEAT_ATTR(_name, _feature_set, _feature_prefix, _feature_bit) \
static struct btrfs_feature_attr btrfs_attr_features_##_name = { \ static struct btrfs_feature_attr btrfs_attr_features_##_name = { \
.kobj_attr = __INIT_KOBJ_ATTR(_name, S_IRUGO, \ .kobj_attr = __INIT_KOBJ_ATTR(_name, S_IRUGO, \
@ -86,4 +92,9 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs);
void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info,
u64 bit, enum btrfs_feature_set set); u64 bit, enum btrfs_feature_set set);
int __init btrfs_init_sysfs(void);
void __cold btrfs_exit_sysfs(void);
int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info);
void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info);
#endif #endif