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

Commit f5ee5c9a authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7c0260ee

fs/btrfs/backref.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
		goto out;

	}



	if (btrfs_test_is_dummy_root(root)) {

	if (btrfs_is_testing(fs_info)) {

		srcu_read_unlock(&fs_info->subvol_srcu, index);

		ret = -ENOENT;

		goto out;

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans, 
				   struct btrfs_root *root,

				   struct extent_buffer *buf)

{

	if (btrfs_test_is_dummy_root(root))

	if (btrfs_is_testing(root->fs_info))

		return 0;



	/* ensure we can see the force_cow */

fs/btrfs/ctree.h

+8 −9
Original line number Diff line number Diff line
@@ -1115,12 +1115,11 @@ struct btrfs_subvolume_writers { 
#define BTRFS_ROOT_REF_COWS		1

#define BTRFS_ROOT_TRACK_DIRTY		2

#define BTRFS_ROOT_IN_RADIX		3

#define BTRFS_ROOT_DUMMY_ROOT		4

#define BTRFS_ROOT_ORPHAN_ITEM_INSERTED	5

#define BTRFS_ROOT_DEFRAG_RUNNING	6

#define BTRFS_ROOT_FORCE_COW		7

#define BTRFS_ROOT_MULTI_LOG_TASKS	8

#define BTRFS_ROOT_DIRTY		9

#define BTRFS_ROOT_ORPHAN_ITEM_INSERTED	4

#define BTRFS_ROOT_DEFRAG_RUNNING	5

#define BTRFS_ROOT_FORCE_COW		6

#define BTRFS_ROOT_MULTI_LOG_TASKS	7

#define BTRFS_ROOT_DIRTY		8



/*

 * in ram representation of the tree.  extent_root is used for all allocations
@@ -3613,13 +3612,13 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) 
void btrfs_test_destroy_inode(struct inode *inode);

#endif



static inline int btrfs_test_is_dummy_root(struct btrfs_root *root)

static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)

{

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))

	if (unlikely(test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO,

			      &fs_info->fs_state)))

		return 1;

#endif

	return 0;

}



#endif

fs/btrfs/disk-io.c

+1 −2
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_fs_info *fs_info, 
struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						 u64 bytenr)

{

	if (btrfs_test_is_dummy_root(root))

	if (btrfs_is_testing(root->fs_info))

		return alloc_test_extent_buffer(root->fs_info, bytenr,

				root->nodesize);

	return alloc_extent_buffer(root->fs_info, bytenr);
@@ -1330,7 +1330,6 @@ struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info, 
	/* We don't use the stripesize in selftest, set it as sectorsize */

	__setup_root(nodesize, sectorsize, sectorsize, root, fs_info,

			BTRFS_ROOT_TREE_OBJECTID);

	set_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state);

	root->alloc_bytenr = 0;



	return root;

fs/btrfs/extent-tree.c

+4 −4
Original line number Diff line number Diff line
@@ -3235,7 +3235,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, 
			    u64, u64, u64, u64, u64, u64);





	if (btrfs_test_is_dummy_root(root))

	if (btrfs_is_testing(root->fs_info))

		return 0;



	ref_root = btrfs_header_owner(buf);
@@ -6101,7 +6101,7 @@ void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes) 
	if (dropped > 0)

		to_free += btrfs_calc_trans_metadata_size(root, dropped);



	if (btrfs_test_is_dummy_root(root))

	if (btrfs_is_testing(root->fs_info))

		return;



	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, 
	int ret;

	struct btrfs_fs_info *fs_info = root->fs_info;



	if (btrfs_test_is_dummy_root(root))

	if (btrfs_is_testing(fs_info))

		return 0;



	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, 
						 SKINNY_METADATA);



#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (btrfs_test_is_dummy_root(root)) {

	if (btrfs_is_testing(root->fs_info)) {

		buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr,

					    level);

		if (!IS_ERR(buf))