p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
James Morris 2016-04-13 11:06:52 +10:00
parent 1c74a7f812 952cca6a72
commit 58976eef9d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/assoc_array.c
View File

@ -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];

2
scripts/asn1_compiler.c
View File

@ -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);
} }