Commit 58976eef authored by James Morris's avatar James Morris

Merge tag 'keys-fixes-20160412' of...

Merge tag 'keys-fixes-20160412' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
parents 1c74a7f8 952cca6a
...@@ -524,7 +524,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit, ...@@ -524,7 +524,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
free_slot = i; free_slot = i;
continue; continue;
} }
if (ops->compare_object(assoc_array_ptr_to_leaf(ptr), index_key)) { if (assoc_array_ptr_is_leaf(ptr) &&
ops->compare_object(assoc_array_ptr_to_leaf(ptr),
index_key)) {
pr_devel("replace in slot %d\n", i); pr_devel("replace in slot %d\n", i);
edit->leaf_p = &node->slots[i]; edit->leaf_p = &node->slots[i];
edit->dead_leaf = node->slots[i]; edit->dead_leaf = node->slots[i];
......
...@@ -650,7 +650,7 @@ int main(int argc, char **argv) ...@@ -650,7 +650,7 @@ int main(int argc, char **argv)
} }
hdr = fopen(headername, "w"); hdr = fopen(headername, "w");
if (!out) { if (!hdr) {
perror(headername); perror(headername);
exit(1); exit(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment