diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2014-09-19 01:46:43 +0200 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2014-09-19 01:46:43 +0200 |
commit | 50dc324a2c9d02784c29961f445b3b222f6b3893 (patch) | |
tree | 083699042afda8b2adf501954763b1a6cec11229 /lib | |
parent | 11139f1775af54b7b7cb875cfdbf586377e163af (diff) | |
parent | af92ba8fd23cb5811d96b833bbb7133efefeb5b9 (diff) |
Merge tag 'v3.14.19' into v3.14-rt
This is the 3.14.19 stable release
Diffstat (limited to 'lib')
-rw-r--r-- | lib/assoc_array.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c index c0b1007011e1..2404d03e251a 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -1723,11 +1723,13 @@ ascend_old_tree: shortcut = assoc_array_ptr_to_shortcut(ptr); slot = shortcut->parent_slot; cursor = shortcut->back_pointer; + if (!cursor) + goto gc_complete; } else { slot = node->parent_slot; cursor = ptr; } - BUG_ON(!ptr); + BUG_ON(!cursor); node = assoc_array_ptr_to_node(cursor); slot++; goto continue_node; @@ -1735,7 +1737,7 @@ ascend_old_tree: gc_complete: edit->set[0].to = new_root; assoc_array_apply_edit(edit); - edit->array->nr_leaves_on_tree = nr_leaves_on_tree; + array->nr_leaves_on_tree = nr_leaves_on_tree; return 0; enomem: |