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

btrfs: change root->root_key.objectid to btrfs_root_id() 



A comment from Filipe on one of my previous cleanups brought my
attention to a new helper we have for getting the root id of a root,
which makes it easier to read in the code.

The changes where made with the following Coccinelle semantic patch:

// <smpl>
@@
expression E,E1;
@@
(
 E->root_key.objectid = E1
|
- E->root_key.objectid
+ btrfs_root_id(E)
)
// </smpl>

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ minor style fixups ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 53e24158

fs/btrfs/backref.c

+4 −4
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void update_share_count(struct share_check *sc, int oldcount, 
	else if (oldcount < 1 && newcount > 0)

		sc->share_count++;



	if (newref->root_id == sc->root->root_key.objectid &&

	if (newref->root_id == btrfs_root_id(sc->root) &&

	    newref->wanted_disk_byte == sc->data_bytenr &&

	    newref->key_for_search.objectid == sc->inum)

		sc->self_ref_count += newref->count;
@@ -769,7 +769,7 @@ static int resolve_indirect_refs(struct btrfs_backref_walk_ctx *ctx, 
			continue;

		}



		if (sc && ref->root_id != sc->root->root_key.objectid) {

		if (sc && ref->root_id != btrfs_root_id(sc->root)) {

			free_pref(ref);

			ret = BACKREF_FOUND_SHARED;

			goto out;
@@ -2623,7 +2623,7 @@ static int iterate_inode_refs(u64 inum, struct inode_fs_paths *ipath) 
			btrfs_debug(fs_root->fs_info,

				"following ref at offset %u for inode %llu in tree %llu",

				cur, found_key.objectid,

				fs_root->root_key.objectid);

				btrfs_root_id(fs_root));

			ret = inode_to_path(parent, name_len,

				      (unsigned long)(iref + 1), eb, ipath);

			if (ret)
@@ -3355,7 +3355,7 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans, 
	if (btrfs_node_blockptr(eb, path->slots[level]) != cur->bytenr) {

		btrfs_err(fs_info,

"couldn't find block (%llu) (level %d) in tree (%llu) with key (%llu %u %llu)",

			  cur->bytenr, level - 1, root->root_key.objectid,

			  cur->bytenr, level - 1, btrfs_root_id(root),

			  tree_key->objectid, tree_key->type, tree_key->offset);

		btrfs_put_root(root);

		ret = -ENOENT;

fs/btrfs/block-rsv.c

+5 −6
Original line number Diff line number Diff line
@@ -341,9 +341,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info) 
	read_lock(&fs_info->global_root_lock);

	rbtree_postorder_for_each_entry_safe(root, tmp, &fs_info->global_root_tree,

					     rb_node) {

		if (root->root_key.objectid == BTRFS_EXTENT_TREE_OBJECTID ||

		    root->root_key.objectid == BTRFS_CSUM_TREE_OBJECTID ||

		    root->root_key.objectid == BTRFS_FREE_SPACE_TREE_OBJECTID) {

		if (btrfs_root_id(root) == BTRFS_EXTENT_TREE_OBJECTID ||

		    btrfs_root_id(root) == BTRFS_CSUM_TREE_OBJECTID ||

		    btrfs_root_id(root) == BTRFS_FREE_SPACE_TREE_OBJECTID) {

			num_bytes += btrfs_root_used(&root->root_item);

			min_items++;

		}
@@ -406,7 +406,7 @@ void btrfs_init_root_block_rsv(struct btrfs_root *root) 
{

	struct btrfs_fs_info *fs_info = root->fs_info;



	switch (root->root_key.objectid) {

	switch (btrfs_root_id(root)) {

	case BTRFS_CSUM_TREE_OBJECTID:

	case BTRFS_EXTENT_TREE_OBJECTID:

	case BTRFS_FREE_SPACE_TREE_OBJECTID:
@@ -468,8 +468,7 @@ static struct btrfs_block_rsv *get_block_rsv( 


	if (test_bit(BTRFS_ROOT_SHAREABLE, &root->state) ||

	    (root == fs_info->uuid_root) ||

	    (trans->adding_csums &&

	     root->root_key.objectid == BTRFS_CSUM_TREE_OBJECTID))

	    (trans->adding_csums && btrfs_root_id(root) == BTRFS_CSUM_TREE_OBJECTID))

		block_rsv = trans->block_rsv;



	if (!block_rsv)

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ int btrfs_compress_filemap_get_folio(struct address_space *mapping, u64 start, 


		btrfs_crit(inode->root->fs_info,

		"failed to get page cache, root %lld ino %llu file offset %llu",

			   inode->root->root_key.objectid, btrfs_ino(inode), start);

			   btrfs_root_id(inode->root), btrfs_ino(inode), start);

		return -ENOENT;

	}

	*in_folio_ret = in_folio;

fs/btrfs/ctree.c

+18 −21
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void add_root_to_dirty_list(struct btrfs_root *root) 
	spin_lock(&fs_info->trans_lock);

	if (!test_and_set_bit(BTRFS_ROOT_DIRTY, &root->state)) {

		/* Want the extent tree to be the last on the list */

		if (root->root_key.objectid == BTRFS_EXTENT_TREE_OBJECTID)

		if (btrfs_root_id(root) == BTRFS_EXTENT_TREE_OBJECTID)

			list_move_tail(&root->dirty_list,

				       &fs_info->dirty_cowonly_roots);

		else
@@ -454,7 +454,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
		}

	} else {

		refs = 1;

		if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||

		if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID ||

		    btrfs_header_backref_rev(buf) < BTRFS_MIXED_BACKREF_REV)

			flags = BTRFS_BLOCK_FLAG_FULL_BACKREF;

		else
@@ -466,15 +466,14 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
	       !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF));



	if (refs > 1) {

		if ((owner == root->root_key.objectid ||

		     root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &&

		if ((owner == btrfs_root_id(root) ||

		     btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) &&

		    !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)) {

			ret = btrfs_inc_ref(trans, root, buf, 1);

			if (ret)

				return ret;



			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID) {

			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) {

				ret = btrfs_dec_ref(trans, root, buf, 0);

				if (ret)

					return ret;
@@ -485,8 +484,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
			new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;

		} else {



			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID)

			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)

				ret = btrfs_inc_ref(trans, root, cow, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0);
@@ -500,8 +498,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
		}

	} else {

		if (flags & BTRFS_BLOCK_FLAG_FULL_BACKREF) {

			if (root->root_key.objectid ==

			    BTRFS_TREE_RELOC_OBJECTID)

			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)

				ret = btrfs_inc_ref(trans, root, cow, 1);

			else

				ret = btrfs_inc_ref(trans, root, cow, 0);
@@ -563,13 +560,13 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans, 
	else

		btrfs_node_key(buf, &disk_key, 0);



	if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {

	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID) {

		if (parent)

			parent_start = parent->start;

		reloc_src_root = btrfs_header_owner(buf);

	}

	cow = btrfs_alloc_tree_block(trans, root, parent_start,

				     root->root_key.objectid, &disk_key, level,

				     btrfs_root_id(root), &disk_key, level,

				     search_start, empty_size, reloc_src_root, nest);

	if (IS_ERR(cow))

		return PTR_ERR(cow);
@@ -582,10 +579,10 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans, 
	btrfs_set_header_backref_rev(cow, BTRFS_MIXED_BACKREF_REV);

	btrfs_clear_header_flag(cow, BTRFS_HEADER_FLAG_WRITTEN |

				     BTRFS_HEADER_FLAG_RELOC);

	if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)

	if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)

		btrfs_set_header_flag(cow, BTRFS_HEADER_FLAG_RELOC);

	else

		btrfs_set_header_owner(cow, root->root_key.objectid);

		btrfs_set_header_owner(cow, btrfs_root_id(root));



	write_extent_buffer_fsid(cow, fs_info->fs_devices->metadata_uuid);
@@ -609,7 +606,7 @@ int btrfs_force_cow_block(struct btrfs_trans_handle *trans, 


	if (buf == root->node) {

		WARN_ON(parent && parent != buf);

		if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID ||

		if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID ||

		    btrfs_header_backref_rev(buf) < BTRFS_MIXED_BACKREF_REV)

			parent_start = buf->start;
@@ -685,7 +682,7 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans, 
	 */

	if (btrfs_header_generation(buf) == trans->transid &&

	    !btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN) &&

	    !(root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID &&

	    !(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID &&

	      btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC)) &&

	    !test_bit(BTRFS_ROOT_FORCE_COW, &root->state))

		return 0;
@@ -1511,7 +1508,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p, 
	check.has_first_key = true;

	check.level = parent_level - 1;

	check.transid = gen;

	check.owner_root = root->root_key.objectid;

	check.owner_root = btrfs_root_id(root);



	/*

	 * If we need to read an extent buffer from disk and we are holding locks
@@ -1556,7 +1553,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p, 
			btrfs_release_path(p);

			return -EIO;

		}

		if (btrfs_check_eb_owner(tmp, root->root_key.objectid)) {

		if (btrfs_check_eb_owner(tmp, btrfs_root_id(root))) {

			free_extent_buffer(tmp);

			btrfs_release_path(p);

			return -EUCLEAN;
@@ -2865,7 +2862,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 
	else

		btrfs_node_key(lower, &lower_key, 0);



	c = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

	c = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),

				   &lower_key, level, root->node->start, 0,

				   0, BTRFS_NESTING_NEW_ROOT);

	if (IS_ERR(c))
@@ -3009,7 +3006,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, 
	mid = (c_nritems + 1) / 2;

	btrfs_node_key(c, &disk_key, mid);



	split = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

	split = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),

				       &disk_key, level, c->start, 0,

				       0, BTRFS_NESTING_SPLIT);

	if (IS_ERR(split))
@@ -3761,7 +3758,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 
	 * BTRFS_NESTING_SPLIT_THE_SPLITTENING if we need to, but for now just

	 * use BTRFS_NESTING_NEW_ROOT.

	 */

	right = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,

	right = btrfs_alloc_tree_block(trans, root, 0, btrfs_root_id(root),

				       &disk_key, 0, l->start, 0, 0,

				       num_doubles ? BTRFS_NESTING_NEW_ROOT :

				       BTRFS_NESTING_SPLIT);

fs/btrfs/defrag.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 


	defrag->ino = btrfs_ino(inode);

	defrag->transid = transid;

	defrag->root = root->root_key.objectid;

	defrag->root = btrfs_root_id(root);

	defrag->extent_thresh = extent_thresh;



	spin_lock(&fs_info->defrag_inodes_lock);