projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
lib
/
assoc_array.c
diff --git
a/lib/assoc_array.c
b/lib/assoc_array.c
index
c0b1007
..
ae146f0
100644
(file)
--- a/
lib/assoc_array.c
+++ b/
lib/assoc_array.c
@@
-1735,7
+1735,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: