From 7751321b54de4fcd146be1709e0a6fed548c3993 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 14 Jun 2012 16:10:13 +0200 Subject: [PATCH] --- yaml --- r: 310830 b: refs/heads/master c: f617e2fd52484fb74236a597d0f9068ec7d9d2dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/backref.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0afefc15e579..3af20bf0583c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d5a0565cebf12c2ef854e4ac1961f13a710a950 +refs/heads/master: f617e2fd52484fb74236a597d0f9068ec7d9d2dd diff --git a/trunk/fs/btrfs/backref.c b/trunk/fs/btrfs/backref.c index 3f75895c919b..579131de1b3b 100644 --- a/trunk/fs/btrfs/backref.c +++ b/trunk/fs/btrfs/backref.c @@ -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);