diff options
| author |   Jan Schmidt <list.btrfs@jan-o-sch.net> | 2012-06-27 15:23:09 +0200 |
|---|---|---|
| committer | Jan Schmidt <list.btrfs@jan-o-sch.net> | 2012-06-27 16:34:38 +0200 |
| commit | 9345457f4a539a40056431aeb6f068750857472f (patch) | |
| tree | 1637c2a734c85ee1d4808b2a5b36a57cd295df27 /fs/btrfs | |
| parent | Btrfs: avoid waiting for delayed refs when we must not (diff) | |
| download | linux-dev-9345457f4a539a40056431aeb6f068750857472f.tar.xz linux-dev-9345457f4a539a40056431aeb6f068750857472f.zip | |
Btrfs: support root level changes in __resolve_indirect_ref
With the tree mod log, we can have a tree that's two levels high, but
btrfs_search_old_slot may still return a path with the tree root at level
one instead. __resolve_indirect_ref must care for this and accept parents in
a lower level than expected.
Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/backref.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 7301cdb4b2cb..cf0df904347f 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -301,10 +301,14 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, goto out; eb = path->nodes[level]; - if (!eb) { - WARN_ON(1); - ret = 1; - goto out; + while (!eb) { + if (!level) { + WARN_ON(1); + ret = 1; + goto out; + } + level--; + eb = path->nodes[level]; } ret = add_all_parents(root, path, parents, level, &ref->key_for_search, |