diff options
| author | Chris Mason <clm@fb.com> | 2014-10-07 22:24:20 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-07 22:24:20 +0200 |
| commit | 0d4cf4e6bf29033709ae8aba4645d873ed0167cc (patch) | |
| tree | 3aa07ec319bc02850d04c8aadc7881b8a62aadb4 /fs | |
| parent | btrfs: Make btrfs handle security mount options internally to avoid losing se... (diff) | |
| download | linux-0d4cf4e6bf29033709ae8aba4645d873ed0167cc.tar.xz linux-0d4cf4e6bf29033709ae8aba4645d873ed0167cc.zip | |
Btrfs: fix compiles when CONFIG_BTRFS_FS_RUN_SANITY_TESTS is off
Commit fccb84c94 moved added some helpers to cleanup our sanity tests,
but it looks like both Dave and I always compile with the tests enabled.
This fixes things to work when they are turned off too.
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 3 | ||||
| -rw-r--r-- | fs/btrfs/extent_io.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index b94c1c76cd59..d557264ee974 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1818,9 +1818,8 @@ struct btrfs_root { u64 highest_objectid; -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS + /* only used with CONFIG_BTRFS_FS_RUN_SANITY_TESTS is enabled */ u64 alloc_bytenr; -#endif u64 defrag_trans_start; struct btrfs_key defrag_progress; diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index f40d67f5866b..6d4b938be986 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -374,7 +374,7 @@ noinline u64 find_lock_delalloc_range(struct inode *inode, struct extent_io_tree *tree, struct page *locked_page, u64 *start, u64 *end, u64 max_bytes); +#endif struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, u64 start, unsigned long len); #endif -#endif |