Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2fa1154 authored by David Sterba's avatar David Sterba
Browse files

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: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a654666a

fs/btrfs/ctree.h

+6 −6
Original line number Diff line number Diff line
@@ -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)

{