diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-04-13 03:06:52 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-04-13 03:06:52 +0200 |
| commit | 58976eef9dc0318ef87bb81a6303b69d941d04bc (patch) | |
| tree | da4ba5ee905e1da35d43e6226d8ea4b3c002adc2 /lib | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | ASN.1: fix open failure check on headername (diff) | |
| download | linux-58976eef9dc0318ef87bb81a6303b69d941d04bc.tar.xz linux-58976eef9dc0318ef87bb81a6303b69d941d04bc.zip | |
Merge tag 'keys-fixes-20160412' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/assoc_array.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c index 03dd576e6773..59fd7c0b119c 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -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]; |