Commit 67439dad authored by David Sterba's avatar David Sterba
Browse files

btrfs: opencode extent_buffer_get 



The helper is trivial and we can understand what the atomic_inc on
something named refs does.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f7bddf1e

fs/btrfs/ctree.c

+6 −6
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
		    btrfs_header_backref_rev(buf) < BTRFS_MIXED_BACKREF_REV)

			parent_start = buf->start;



		extent_buffer_get(cow);

		atomic_inc(&cow->refs);

		ret = tree_mod_log_insert_root(root->node, cow, 1);

		BUG_ON(ret < 0);

		rcu_assign_pointer(root->node, cow);
@@ -2011,7 +2011,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
	/* update the path */

	if (left) {

		if (btrfs_header_nritems(left) > orig_slot) {

			extent_buffer_get(left);

			atomic_inc(&left->refs);

			/* left was locked after cow */

			path->nodes[level] = left;

			path->slots[level + 1] -= 1;
@@ -2601,7 +2601,7 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root, 


		} else {

			b = root->commit_root;

			extent_buffer_get(b);

			atomic_inc(&b->refs);

		}

		level = btrfs_header_level(b);

		/*
@@ -3375,7 +3375,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 
	free_extent_buffer(old);



	add_root_to_dirty_list(root);

	extent_buffer_get(c);

	atomic_inc(&c->refs);

	path->nodes[level] = c;

	path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;

	path->slots[level] = 0;
@@ -4908,7 +4908,7 @@ static noinline void btrfs_del_leaf(struct btrfs_trans_handle *trans, 


	root_sub_used(root, leaf->len);



	extent_buffer_get(leaf);

	atomic_inc(&leaf->refs);

	btrfs_free_tree_block(trans, root, leaf, 0, 1);

	free_extent_buffer_stale(leaf);

}
@@ -4989,7 +4989,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
			 * for possible call to del_ptr below

			 */

			slot = path->slots[1];

			extent_buffer_get(leaf);

			atomic_inc(&leaf->refs);



			btrfs_set_path_blocking(path);

			wret = push_leaf_left(trans, root, path, 1, 1,

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, 
	/* the pending IO might have been the only thing that kept this buffer

	 * in memory.  Make sure we have a ref for all this other checks

	 */

	extent_buffer_get(eb);

	atomic_inc(&eb->refs);



	reads_done = atomic_dec_and_test(&eb->io_pages);

	if (!reads_done)

fs/btrfs/extent-tree.c

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


	btrfs_assert_tree_locked(parent);

	parent_level = btrfs_header_level(parent);

	extent_buffer_get(parent);

	atomic_inc(&parent->refs);

	path->nodes[parent_level] = parent;

	path->slots[parent_level] = btrfs_header_nritems(parent);

fs/btrfs/extent_io.h

+0 −5
Original line number Diff line number Diff line
@@ -230,11 +230,6 @@ static inline int num_extent_pages(const struct extent_buffer *eb) 
	       (eb->start >> PAGE_SHIFT);

}



static inline void extent_buffer_get(struct extent_buffer *eb)

{

	atomic_inc(&eb->refs);

}



static inline int extent_buffer_uptodate(struct extent_buffer *eb)

{

	return test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);

fs/btrfs/qgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans, 
		btrfs_item_key_to_cpu(dst_path->nodes[dst_level], &key, 0);



	/* For src_path */

	extent_buffer_get(src_eb);

	atomic_inc(&src_eb->refs);

	src_path->nodes[root_level] = src_eb;

	src_path->slots[root_level] = dst_path->slots[root_level];

	src_path->locks[root_level] = 0;
@@ -2067,7 +2067,7 @@ static int qgroup_trace_subtree_swap(struct btrfs_trans_handle *trans, 
		goto out;

	}

	/* For dst_path */

	extent_buffer_get(dst_eb);

	atomic_inc(&dst_eb->refs);

	dst_path->nodes[level] = dst_eb;

	dst_path->slots[level] = 0;

	dst_path->locks[level] = 0;
@@ -2126,7 +2126,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans, 
	 * walk back up the tree (adjusting slot pointers as we go)

	 * and restart the search process.

	 */

	extent_buffer_get(root_eb); /* For path */

	atomic_inc(&root_eb->refs);	/* For path */

	path->nodes[root_level] = root_eb;

	path->slots[root_level] = 0;

	path->locks[root_level] = 0; /* so release_path doesn't try to unlock */