mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
Merge tag 'keys-fixes-20160412' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
This commit is contained in:
commit
58976eef9d
@ -524,7 +524,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
|
||||
free_slot = i;
|
||||
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);
|
||||
edit->leaf_p = &node->slots[i];
|
||||
edit->dead_leaf = node->slots[i];
|
||||
|
@ -650,7 +650,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
hdr = fopen(headername, "w");
|
||||
if (!out) {
|
||||
if (!hdr) {
|
||||
perror(headername);
|
||||
exit(1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user