Commit e721043a authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove pointless 'ref_root' variable from run_delayed_data_ref() 



The 'ref_root' variable, at run_delayed_data_ref(), is not really needed
as we can always use ref->root directly, plus its initialization to 0 is
completely pointless as we assign it ref->root before its first use.
So just drop that variable and use ref->root directly.

This may help avoid some warnings with clang tools such as the one
reported/fixed by commit 966de47f ("btrfs: remove redundant
initialization of variables in log_new_ancestors").

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7cce0d69

fs/btrfs/extent-tree.c

+3 −5
Original line number Diff line number Diff line
@@ -1536,7 +1536,6 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans, 
	int ret = 0;

	struct btrfs_delayed_data_ref *ref;

	u64 parent = 0;

	u64 ref_root = 0;

	u64 flags = 0;



	ref = btrfs_delayed_node_to_data_ref(node);
@@ -1544,7 +1543,6 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans, 


	if (node->type == BTRFS_SHARED_DATA_REF_KEY)

		parent = ref->parent;

	ref_root = ref->root;



	if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) {

		struct btrfs_key key;
@@ -1556,17 +1554,17 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans, 
		key.type = BTRFS_EXTENT_ITEM_KEY;

		key.offset = node->num_bytes;



		ret = alloc_reserved_file_extent(trans, parent, ref_root,

		ret = alloc_reserved_file_extent(trans, parent, ref->root,

						 flags, ref->objectid,

						 ref->offset, &key,

						 node->ref_mod);

	} else if (node->action == BTRFS_ADD_DELAYED_REF) {

		ret = __btrfs_inc_extent_ref(trans, node, parent, ref_root,

		ret = __btrfs_inc_extent_ref(trans, node, parent, ref->root,

					     ref->objectid, ref->offset,

					     extent_op);

	} else if (node->action == BTRFS_DROP_DELAYED_REF) {

		ret = __btrfs_free_extent(trans, node, parent,

					  ref_root, ref->objectid,

					  ref->root, ref->objectid,

					  ref->offset, extent_op);

	} else {

		BUG();