Arraymap was not converted to use bpf_map_init_from_attr() to avoid merge conflicts with emergency fixes. Do it now.
Unified · Split
| @@ -120,12 +120,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) · 119 unmodified lines | |||
| 120 | array->map.unpriv_array = unpriv; | 120 | array->map.unpriv_array = unpriv; |
| 121 | 121 | ||
| 122 | /* copy mandatory map attributes */ | 122 | /* copy mandatory map attributes */ |
| 123 | array->map.map_type = attr->map_type; | 123 | bpf_map_init_from_attr(&array->map, attr); |
| 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; | ||
| 129 | array->elem_size = elem_size; | 124 | array->elem_size = elem_size; |
| 130 | 125 | ||
| 131 | if (!percpu) | 126 | if (!percpu) |