From: David Sterba <dsterba@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: David Sterba <dsterba@suse.com>
Subject: [PATCH 4/4] btrfs: tests: polish ifdefs around testing helper
Date: Mon, 10 Sep 2018 19:22:31 +0200 [thread overview]
Message-ID: <7a6c4814d8467999d9a9eb12906ff28a3f90b284.1536599879.git.dsterba@suse.com> (raw)
In-Reply-To: <cover.1536599879.git.dsterba@suse.com>
Avoid the inline ifdefs and use two sections for self-tests enabled and
disabled.
Signed-off-by: David Sterba <dsterba@suse.com>
---
fs/btrfs/ctree.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 32d2fce4ac53..8dafc7bb6ad8 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3708,17 +3708,20 @@ 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 0;
}
+#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)
{
--
2.18.0
next prev parent reply other threads:[~2018-09-10 22:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 17:22 [PATCH 0/4] Self-test cleanups David Sterba
2018-09-10 17:22 ` [PATCH 1/4] btrfs: tests: add separate stub for find_lock_delalloc_range David Sterba
2018-09-10 23:40 ` Omar Sandoval
2018-09-11 8:50 ` David Sterba
2018-09-14 16:38 ` [PATCH 1/4 v2] " David Sterba
2018-09-17 17:43 ` Omar Sandoval
2018-09-10 17:22 ` [PATCH 2/4] btrfs: tests: move testing members of struct btrfs_root to the end David Sterba
2018-09-10 23:37 ` Omar Sandoval
2018-09-10 17:22 ` [PATCH 3/4] btrfs: tests: group declarations of self-test helpers David Sterba
2018-09-10 23:41 ` Omar Sandoval
2018-09-10 17:22 ` David Sterba [this message]
2018-09-10 23:43 ` [PATCH 4/4] btrfs: tests: polish ifdefs around testing helper Omar Sandoval
2018-09-11 9:22 ` David Sterba
2018-09-11 19:14 ` Omar Sandoval
2018-09-14 14:20 ` David Sterba
2018-09-14 16:42 ` [PATCH 4/4 v2] " David Sterba
2018-09-17 17:40 ` Omar Sandoval
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7a6c4814d8467999d9a9eb12906ff28a3f90b284.1536599879.git.dsterba@suse.com \
--to=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).