iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: tests: polish ifdefs around testing helper

Browse Source 
Avoid the inline ifdefs and use two sections for self-tests enabled and
disabled.

Though there could be no ifdef and unconditional test_bit of
BTRFS_FS_STATE_DUMMY_FS_INFO, the static inline can help to optimize out
any code that would depend on conditions using btrfs_is_testing.

As this is only for the testing code, drop unlikely().

Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-08-17 17:48:13 +02:00
parent a654666a34
commit b2fa11547b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/ctree.h
View File

@ -3706,17 +3706,17 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
void btrfs_test_inode_set_ops(struct inode *inode); void btrfs_test_inode_set_ops(struct inode *inode);
void btrfs_test_destroy_inode(struct inode *inode); void btrfs_test_destroy_inode(struct inode *inode);
#endif
static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)
{ {
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state);
if (unlikely(test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, }
&fs_info->fs_state))) #else
return 1; static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)
#endif {
return 0; return 0;
} }
#endif
static inline void cond_wake_up(struct wait_queue_head *wq) static inline void cond_wake_up(struct wait_queue_head *wq)
{ {