btrfs: use btrfs_read_node_slot in replace_path

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

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 57efb903016f824c2e798f07066163ccca10f488..9f80f5352dfdc012215b75ffe497a650de07182e 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1218,8 +1218,6 @@ again:
 
        parent = eb;
        while (1) {
-               struct btrfs_key first_key;
-
                level = btrfs_header_level(parent);
                BUG_ON(level < lowest_level);
 
@@ -1235,7 +1233,6 @@ again:
                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 @@ again:
                                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) {