diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2022-10-26 15:08:38 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-12-05 18:00:47 +0100 |
| commit | 6a6b4daf92fd8393eeac9631318d48d5b25ee4df (patch) | |
| tree | c79fffe66ccc521f314e8e915abc9b0d800c3643 /fs | |
| parent | 5c11adcc383a94cacd652461c9435bf7a5c53c9c (diff) | |
btrfs: move CONFIG_BTRFS_FS_RUN_SANITY_TESTS checks to fs.h
We already have a few of these in fs.h, move the remaining checks out of
ctree.h into fs.h.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 15 | ||||
| -rw-r--r-- | fs/btrfs/fs.h | 9 |
2 files changed, 9 insertions, 15 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 15bb90536460..27bfedf3a9fb 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -722,16 +722,6 @@ static inline unsigned long get_eb_page_index(unsigned long offset) return offset >> PAGE_SHIFT; } -/* - * Use that for functions that are conditionally exported for sanity tests but - * otherwise static - */ -#ifndef CONFIG_BTRFS_FS_RUN_SANITY_TESTS -#define EXPORT_FOR_TESTS static -#else -#define EXPORT_FOR_TESTS -#endif - static inline int is_fstree(u64 rootid) { if (rootid == BTRFS_FS_TREE_OBJECTID || @@ -741,11 +731,6 @@ static inline int is_fstree(u64 rootid) return 0; } -/* Sanity test specific functions */ -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS -void btrfs_test_destroy_inode(struct inode *inode); -#endif - static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root) { return root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID; diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h index a49d11127bf7..7d0da8509567 100644 --- a/fs/btrfs/fs.h +++ b/fs/btrfs/fs.h @@ -971,11 +971,20 @@ static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info) &(fs_info)->fs_state))) #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS + +#define EXPORT_FOR_TESTS + static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) { return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state); } + +void btrfs_test_destroy_inode(struct inode *inode); + #else + +#define EXPORT_FOR_TESTS static + static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) { return 0; |