diff options
| author | David Sterba <dsterba@suse.com> | 2018-08-17 17:48:13 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-10-15 17:23:34 +0200 |
| commit | b2fa11547bc1693a8dd8e7379dd4e43d31f49c50 (patch) | |
| tree | d83d4d7d8c8f35bb6e2b768cf061e2d52d630a83 /fs | |
| parent | a654666a3474312ee76aa2bb9744376a46da3307 (diff) | |
| download | linux-b2fa11547bc1693a8dd8e7379dd4e43d31f49c50.tar.gz linux-b2fa11547bc1693a8dd8e7379dd4e43d31f49c50.tar.bz2 linux-b2fa11547bc1693a8dd8e7379dd4e43d31f49c50.zip | |
btrfs: tests: polish ifdefs around testing helper
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4653c87d0ff5..36ade217e462 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3706,17 +3706,17 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS void btrfs_test_inode_set_ops(struct inode *inode); void btrfs_test_destroy_inode(struct inode *inode); -#endif static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) { -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS - if (unlikely(test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, - &fs_info->fs_state))) - return 1; -#endif + return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state); +} +#else +static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info) +{ return 0; } +#endif static inline void cond_wake_up(struct wait_queue_head *wq) { |