From: David Sterba Date: Fri, 15 Jul 2016 13:23:37 +0000 (+0200) Subject: btrfs: hide test-only member under ifdef X-Git-Tag: v4.9.8~1319^2~27^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05653ef38659edc46a886c9bda105e64edba6896;p=platform%2Fkernel%2Flinux-rpi3.git btrfs: hide test-only member under ifdef Signed-off-by: David Sterba --- diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 83a6a93..8627b7f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1181,8 +1181,10 @@ 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-tree.c b/fs/btrfs/extent-tree.c index 3bb9607..81d8330 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -8354,6 +8354,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, bool skinny_metadata = btrfs_fs_incompat(root->fs_info, SKINNY_METADATA); +#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS if (btrfs_test_is_dummy_root(root)) { buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr, level); @@ -8361,6 +8362,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, root->alloc_bytenr += blocksize; return buf; } +#endif block_rsv = use_block_rsv(trans, root, blocksize); if (IS_ERR(block_rsv))