Skip to content

Commit

Permalink
Btrfs: remove obsolete btrfs_next_leaf call from __resolve_indirect_ref
Browse files Browse the repository at this point in the history
When resolving indirect refs, we used to call btrfs_next_leaf in case we
didn't find an exact match. While we should find exact matches most of the
time, in case we don't, we must continue searching. Treating those matches
differently depending on the level we're searching doesn't make sense.

Even worse, we might end up searching for a key larger than the largest, in
which case there is no next_leaf and subsequent jobs would fail. This commit
drops the bogous lines.

Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
  • Loading branch information
Jan Schmidt committed Jun 14, 2012
1 parent 4d5a056 commit f617e2f
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions fs/btrfs/backref.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,16 +294,8 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info,
goto out;
}

if (level == 0) {
if (ret == 1 && path->slots[0] >= btrfs_header_nritems(eb)) {
ret = btrfs_next_leaf(root, path);
if (ret)
goto out;
eb = path->nodes[0];
}

if (level == 0)
btrfs_item_key_to_cpu(eb, &key, path->slots[0]);
}

ret = add_all_parents(root, path, parents, level, &key,
ref->wanted_disk_byte, extent_item_pos);
Expand Down

0 comments on commit f617e2f

Please sign in to comment.