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

btrfs: use btrfs_read_node_slot in replace_path 



We're open-coding btrfs_read_node_slot() here, replace with the helper.

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

fs/btrfs/relocation.c

+1 −9
Original line number Diff line number Diff line
@@ -1218,8 +1218,6 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 


	parent = eb;

	while (1) {

		struct btrfs_key first_key;



		level = btrfs_header_level(parent);

		BUG_ON(level < lowest_level);
@@ -1235,7 +1233,6 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 
		old_bytenr = btrfs_node_blockptr(parent, slot);

		blocksize = fs_info->nodesize;

		old_ptr_gen = btrfs_node_ptr_generation(parent, slot);

		btrfs_node_key_to_cpu(parent, &first_key, slot);



		if (level <= max_level) {

			eb = path->nodes[level];
@@ -1260,15 +1257,10 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 
				break;

			}



			eb = read_tree_block(fs_info, old_bytenr, old_ptr_gen,

					     level - 1, &first_key);

			eb = btrfs_read_node_slot(parent, slot);

			if (IS_ERR(eb)) {

				ret = PTR_ERR(eb);

				break;

			} else if (!extent_buffer_uptodate(eb)) {

				ret = -EIO;

				free_extent_buffer(eb);

				break;

			}

			btrfs_tree_lock(eb);

			if (cow) {