OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: remove obsolete btrfs_next_leaf call from __resolve_indirect_ref 

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>
This commit is contained in:
Jan Schmidt 2012-06-14 16:10:13 +02:00
parent 4d5a0565ce
commit f617e2fd52
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/backref.c
View File

@ -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);