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>
This commit is contained in:
parent
c975253682
commit
6b3426be27
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue