bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: move CONFIG_BTRFS_FS_RUN_SANITY_TESTS checks to fs.h

Browse source 
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>
This commit is contained in:
Josef Bacik 2022-10-26 15:08:38 -04:00 • committed by David Sterba
parent 5c11adcc38
commit 6a6b4daf92
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fs/btrfs/ctree.h
View file

@ -722,16 +722,6 @@ static inline unsigned long get_eb_page_index(unsigned long offset)
return offset >> PAGE_SHIFT; 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) static inline int is_fstree(u64 rootid)
{ {
if (rootid == BTRFS_FS_TREE_OBJECTID || if (rootid == BTRFS_FS_TREE_OBJECTID ||
@ -741,11 +731,6 @@ static inline int is_fstree(u64 rootid)
return 0; 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) static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)
{ {
return root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID; return root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID;

9
fs/btrfs/fs.h
View file

@ -971,11 +971,20 @@ static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info)
&(fs_info)->fs_state))) &(fs_info)->fs_state)))
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
#define EXPORT_FOR_TESTS
static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) 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); return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state);
} }
void btrfs_test_destroy_inode(struct inode *inode);
#else #else
#define EXPORT_FOR_TESTS static
static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)
{ {
return 0; return 0;