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.

Jakub Kicinski committed 8 years ago

Commit 32852641 parent ad460611 file · +1 −6Browse files

Showing the changes to kernel/bpf/arraymap.c (1 of 1 file). Show all

Unified · Split

@@ -120,12 +120,7 @@ static struct bpf_map array_map_alloc(union bpf_attr attr) · 119 unmodified lines
120	120	array->map.unpriv_array = unpriv;
121	121
122	122	/* copy mandatory map attributes */
123		− array->map.map_type = attr->map_type;
124		− array->map.key_size = attr->key_size;
125		− array->map.value_size = attr->value_size;
126		− array->map.max_entries = attr->max_entries;
127		− array->map.map_flags = attr->map_flags;
128		− array->map.numa_node = numa_node;
	123	+ bpf_map_init_from_attr(&array->map, attr);
129	124	array->elem_size = elem_size;
130	125
131	126	if (!percpu)

Keyboard shortcuts