Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32852649 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpf: arraymap: use bpf_map_init_from_attr() 



Arraymap was not converted to use bpf_map_init_from_attr()
to avoid merge conflicts with emergency fixes.  Do it now.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent ad46061f

kernel/bpf/arraymap.c

+1 −6
Original line number Diff line number Diff line
@@ -120,12 +120,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) 
	array->map.unpriv_array = unpriv;



	/* copy mandatory map attributes */

	array->map.map_type = attr->map_type;

	array->map.key_size = attr->key_size;

	array->map.value_size = attr->value_size;

	array->map.max_entries = attr->max_entries;

	array->map.map_flags = attr->map_flags;

	array->map.numa_node = numa_node;

	bpf_map_init_from_attr(&array->map, attr);

	array->elem_size = elem_size;



	if (!percpu)