Commit f617e2fd authored Jun 14, 2012 by Jan Schmidt

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>

parent 4d5a0565

fs/btrfs/backref.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -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);

Admin message