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

btrfs: use btrfs_read_node_slot in walk_down_tree 



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 6b3426be

fs/btrfs/ref-verify.c

+2 −16
Original line number Diff line number Diff line
@@ -551,29 +551,15 @@ static int process_leaf(struct btrfs_root *root, 
static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,

			  int level, u64 *bytenr, u64 *num_bytes)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct extent_buffer *eb;

	u64 block_bytenr, gen;

	int ret = 0;



	while (level >= 0) {

		if (level) {

			struct btrfs_key first_key;



			block_bytenr = btrfs_node_blockptr(path->nodes[level],

							   path->slots[level]);

			gen = btrfs_node_ptr_generation(path->nodes[level],

			eb = btrfs_read_node_slot(path->nodes[level],

						  path->slots[level]);

			btrfs_node_key_to_cpu(path->nodes[level], &first_key,

					      path->slots[level]);

			eb = read_tree_block(fs_info, block_bytenr, gen,

					     level - 1, &first_key);

			if (IS_ERR(eb))

				return PTR_ERR(eb);

			if (!extent_buffer_uptodate(eb)) {

				free_extent_buffer(eb);

				return -EIO;

			}

			btrfs_tree_read_lock(eb);

			path->nodes[level-1] = eb;

			path->slots[level-1] = 0;