aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2016-06-21 09:52:41 -0400
committerDavid Sterba <dsterba@suse.com>2016-07-26 07:54:19 -0400
commitf5ee5c9ac56cd328fcc915582f81226affebd81c (patch)
treea8794c47784f0565553233353702d02fd2e5fc28 /fs/btrfs/extent-tree.c
parent7c0260ee098db7a05fd68812b2e21ce2e19dfcf0 (diff)
btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root
Now that we have a dummy fs_info associated with each test that uses a root, we don't need the DUMMY_ROOT bit anymore. This lets us make choices without needing an actual root like in e.g. btrfs_find_create_tree_block. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 44b529f183e3..c4487e177234 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3235,7 +3235,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
3235 u64, u64, u64, u64, u64, u64); 3235 u64, u64, u64, u64, u64, u64);
3236 3236
3237 3237
3238 if (btrfs_test_is_dummy_root(root)) 3238 if (btrfs_is_testing(root->fs_info))
3239 return 0; 3239 return 0;
3240 3240
3241 ref_root = btrfs_header_owner(buf); 3241 ref_root = btrfs_header_owner(buf);
@@ -6101,7 +6101,7 @@ void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes)
6101 if (dropped > 0) 6101 if (dropped > 0)
6102 to_free += btrfs_calc_trans_metadata_size(root, dropped); 6102 to_free += btrfs_calc_trans_metadata_size(root, dropped);
6103 6103
6104 if (btrfs_test_is_dummy_root(root)) 6104 if (btrfs_is_testing(root->fs_info))
6105 return; 6105 return;
6106 6106
6107 trace_btrfs_space_reservation(root->fs_info, "delalloc", 6107 trace_btrfs_space_reservation(root->fs_info, "delalloc",
@@ -7217,7 +7217,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root,
7217 int ret; 7217 int ret;
7218 struct btrfs_fs_info *fs_info = root->fs_info; 7218 struct btrfs_fs_info *fs_info = root->fs_info;
7219 7219
7220 if (btrfs_test_is_dummy_root(root)) 7220 if (btrfs_is_testing(fs_info))
7221 return 0; 7221 return 0;
7222 7222
7223 add_pinned_bytes(root->fs_info, num_bytes, owner, root_objectid); 7223 add_pinned_bytes(root->fs_info, num_bytes, owner, root_objectid);
@@ -8356,7 +8356,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
8356 SKINNY_METADATA); 8356 SKINNY_METADATA);
8357 8357
8358#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS 8358#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
8359 if (btrfs_test_is_dummy_root(root)) { 8359 if (btrfs_is_testing(root->fs_info)) {
8360 buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr, 8360 buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr,
8361 level); 8361 level);
8362 if (!IS_ERR(buf)) 8362 if (!IS_ERR(buf))