Commit 29cbcf40 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: stop accessing ->extent_root directly 



When we start having multiple extent roots we'll need to use a helper to
get to the correct extent_root.  Rename fs_info->extent_root to
_extent_root and convert all of the users of the extent root to using
the btrfs_extent_root() helper.  This will allow us to easily clean up
the remaining direct accesses in the future.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2e608bd1

fs/btrfs/backref.c

+10 −6
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
			     struct ulist *roots, const u64 *extent_item_pos,

			     struct share_check *sc, bool ignore_offset)

{

	struct btrfs_root *root = fs_info->extent_root;

	struct btrfs_root *root = btrfs_extent_root(fs_info, bytenr);

	struct btrfs_key key;

	struct btrfs_path *path;

	struct btrfs_delayed_ref_root *delayed_refs = NULL;
@@ -1747,6 +1747,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
			struct btrfs_path *path, struct btrfs_key *found_key,

			u64 *flags_ret)

{

	struct btrfs_root *extent_root = btrfs_extent_root(fs_info, logical);

	int ret;

	u64 flags;

	u64 size = 0;
@@ -1762,11 +1763,11 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
	key.objectid = logical;

	key.offset = (u64)-1;



	ret = btrfs_search_slot(NULL, fs_info->extent_root, &key, path, 0, 0);

	ret = btrfs_search_slot(NULL, extent_root, &key, path, 0, 0);

	if (ret < 0)

		return ret;



	ret = btrfs_previous_extent_item(fs_info->extent_root, path, 0);

	ret = btrfs_previous_extent_item(extent_root, path, 0);

	if (ret) {

		if (ret > 0)

			ret = -ENOENT;
@@ -2335,6 +2336,7 @@ struct btrfs_backref_iter *btrfs_backref_iter_alloc( 
int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr)

{

	struct btrfs_fs_info *fs_info = iter->fs_info;

	struct btrfs_root *extent_root = btrfs_extent_root(fs_info, bytenr);

	struct btrfs_path *path = iter->path;

	struct btrfs_extent_item *ei;

	struct btrfs_key key;
@@ -2345,7 +2347,7 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr) 
	key.offset = (u64)-1;

	iter->bytenr = bytenr;



	ret = btrfs_search_slot(NULL, fs_info->extent_root, &key, path, 0, 0);

	ret = btrfs_search_slot(NULL, extent_root, &key, path, 0, 0);

	if (ret < 0)

		return ret;

	if (ret == 0) {
@@ -2388,7 +2390,7 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr) 


	/* If there is no inline backref, go search for keyed backref */

	if (iter->cur_ptr >= iter->end_ptr) {

		ret = btrfs_next_item(fs_info->extent_root, path);

		ret = btrfs_next_item(extent_root, path);



		/* No inline nor keyed ref */

		if (ret > 0) {
@@ -2432,6 +2434,7 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr) 
int btrfs_backref_iter_next(struct btrfs_backref_iter *iter)

{

	struct extent_buffer *eb = btrfs_backref_get_eb(iter);

	struct btrfs_root *extent_root;

	struct btrfs_path *path = iter->path;

	struct btrfs_extent_inline_ref *iref;

	int ret;
@@ -2462,7 +2465,8 @@ int btrfs_backref_iter_next(struct btrfs_backref_iter *iter) 
	}



	/* We're at keyed items, there is no inline item, go to the next one */

	ret = btrfs_next_item(iter->fs_info->extent_root, iter->path);

	extent_root = btrfs_extent_root(iter->fs_info, iter->bytenr);

	ret = btrfs_next_item(extent_root, iter->path);

	if (ret)

		return ret;

fs/btrfs/block-group.c

+2 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl) 
{

	struct btrfs_block_group *block_group = caching_ctl->block_group;

	struct btrfs_fs_info *fs_info = block_group->fs_info;

	struct btrfs_root *extent_root = fs_info->extent_root;

	struct btrfs_root *extent_root;

	struct btrfs_path *path;

	struct extent_buffer *leaf;

	struct btrfs_key key;
@@ -529,6 +529,7 @@ static int load_extent_tree_free(struct btrfs_caching_control *caching_ctl) 
		return -ENOMEM;



	last = max_t(u64, block_group->start, BTRFS_SUPER_INFO_OFFSET);

	extent_root = btrfs_extent_root(fs_info, last);



#ifdef CONFIG_BTRFS_DEBUG

	/*

fs/btrfs/block-rsv.c

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "space-info.h"

#include "transaction.h"

#include "block-group.h"

#include "disk-io.h"



/*

 * HOW DO BLOCK RESERVES WORK
@@ -351,6 +352,7 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info) 
{

	struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;

	struct btrfs_space_info *sinfo = block_rsv->space_info;

	struct btrfs_root *extent_root = btrfs_extent_root(fs_info, 0);

	u64 num_bytes;

	unsigned min_items;
@@ -359,7 +361,7 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info) 
	 * checksum tree and the root tree.  If the fs is empty we want to set

	 * it to a minimal amount for safety.

	 */

	num_bytes = btrfs_root_used(&fs_info->extent_root->root_item) +

	num_bytes = btrfs_root_used(&extent_root->root_item) +

		btrfs_root_used(&fs_info->csum_root->root_item) +

		btrfs_root_used(&fs_info->tree_root->root_item);

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ enum btrfs_exclusive_operation { 
struct btrfs_fs_info {

	u8 chunk_tree_uuid[BTRFS_UUID_SIZE];

	unsigned long flags;

	struct btrfs_root *extent_root;

	struct btrfs_root *_extent_root;

	struct btrfs_root *tree_root;

	struct btrfs_root *chunk_root;

	struct btrfs_root *dev_root;

fs/btrfs/disk-io.c

+8 −7
Original line number Diff line number Diff line
@@ -1557,7 +1557,7 @@ static struct btrfs_root *btrfs_get_global_root(struct btrfs_fs_info *fs_info, 
	if (objectid == BTRFS_ROOT_TREE_OBJECTID)

		return btrfs_grab_root(fs_info->tree_root);

	if (objectid == BTRFS_EXTENT_TREE_OBJECTID)

		return btrfs_grab_root(fs_info->extent_root);

		return btrfs_grab_root(fs_info->_extent_root);

	if (objectid == BTRFS_CHUNK_TREE_OBJECTID)

		return btrfs_grab_root(fs_info->chunk_root);

	if (objectid == BTRFS_DEV_TREE_OBJECTID)
@@ -1630,7 +1630,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info) 
	btrfs_free_ref_cache(fs_info);

	kfree(fs_info->balance_ctl);

	kfree(fs_info->delayed_root);

	btrfs_put_root(fs_info->extent_root);

	btrfs_put_root(fs_info->_extent_root);

	btrfs_put_root(fs_info->tree_root);

	btrfs_put_root(fs_info->chunk_root);

	btrfs_put_root(fs_info->dev_root);
@@ -2008,6 +2008,7 @@ static void backup_super_roots(struct btrfs_fs_info *info) 
{

	const int next_backup = info->backup_root_index;

	struct btrfs_root_backup *root_backup;

	struct btrfs_root *extent_root = btrfs_extent_root(info, 0);



	root_backup = info->super_for_commit->super_roots + next_backup;
@@ -2032,11 +2033,11 @@ static void backup_super_roots(struct btrfs_fs_info *info) 
	btrfs_set_backup_chunk_root_level(root_backup,

			       btrfs_header_level(info->chunk_root->node));



	btrfs_set_backup_extent_root(root_backup, info->extent_root->node->start);

	btrfs_set_backup_extent_root(root_backup, extent_root->node->start);

	btrfs_set_backup_extent_root_gen(root_backup,

			       btrfs_header_generation(info->extent_root->node));

			       btrfs_header_generation(extent_root->node));

	btrfs_set_backup_extent_root_level(root_backup,

			       btrfs_header_level(info->extent_root->node));

			       btrfs_header_level(extent_root->node));



	/*

	 * we might commit during log recovery, which happens before we set
@@ -2166,7 +2167,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, bool free_chunk_root) 
	free_root_extent_buffers(info->tree_root);



	free_root_extent_buffers(info->dev_root);

	free_root_extent_buffers(info->extent_root);

	free_root_extent_buffers(info->_extent_root);

	free_root_extent_buffers(info->csum_root);

	free_root_extent_buffers(info->quota_root);

	free_root_extent_buffers(info->uuid_root);
@@ -2456,7 +2457,7 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info) 
		}

	} else {

		set_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state);

		fs_info->extent_root = root;

		fs_info->_extent_root = root;

	}



	location.objectid = BTRFS_DEV_TREE_OBJECTID;