summaryrefslogtreecommitdiff
path: root/lib/assoc_array.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/assoc_array.c')
-rw-r--r--lib/assoc_array.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 6cd376ad5030..45d24dde71b6 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -454,7 +454,7 @@ static bool assoc_array_insert_in_empty_tree(struct assoc_array_edit *edit)
pr_devel("-->%s()\n", __func__);
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
@@ -536,11 +536,11 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
* those now. We may also need a new shortcut, but we deal with that
* when we need it.
*/
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
edit->new_meta[0] = assoc_array_node_to_ptr(new_n0);
- new_n1 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n1 = kzalloc_obj(struct assoc_array_node);
if (!new_n1)
return false;
edit->new_meta[1] = assoc_array_node_to_ptr(new_n1);
@@ -832,7 +832,7 @@ static bool assoc_array_insert_mid_shortcut(struct assoc_array_edit *edit,
edit->excised_meta[0] = assoc_array_shortcut_to_ptr(shortcut);
/* Create a new node now since we're going to need it anyway */
- new_n0 = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n0 = kzalloc_obj(struct assoc_array_node);
if (!new_n0)
return false;
edit->new_meta[0] = assoc_array_node_to_ptr(new_n0);
@@ -975,7 +975,7 @@ struct assoc_array_edit *assoc_array_insert(struct assoc_array *array,
*/
BUG_ON(assoc_array_ptr_is_meta(object));
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1087,7 +1087,7 @@ struct assoc_array_edit *assoc_array_delete(struct assoc_array *array,
pr_devel("-->%s()\n", __func__);
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1280,7 +1280,7 @@ struct assoc_array_edit *assoc_array_clear(struct assoc_array *array,
if (!array->root)
return NULL;
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return ERR_PTR(-ENOMEM);
edit->array = array;
@@ -1468,7 +1468,7 @@ int assoc_array_gc(struct assoc_array *array,
if (!array->root)
return 0;
- edit = kzalloc_obj(struct assoc_array_edit, GFP_KERNEL);
+ edit = kzalloc_obj(struct assoc_array_edit);
if (!edit)
return -ENOMEM;
edit->array = array;
@@ -1503,7 +1503,7 @@ descend:
/* Duplicate the node at this position */
node = assoc_array_ptr_to_node(cursor);
- new_n = kzalloc_obj(struct assoc_array_node, GFP_KERNEL);
+ new_n = kzalloc_obj(struct assoc_array_node);
if (!new_n)
goto enomem;
pr_devel("dup node %p -> %p\n", node, new_n);