| Message ID | 20180125235402.30527-1-mic@digikod.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [net-next,v1] bpf: Use the IS_FD_ARRAY() macro in map_update_elem() | expand |
On Fri, Jan 26, 2018 at 12:54:02AM +0100, Mickaël Salaün wrote: > Make the code more readable. > > Signed-off-by: Mickaël Salaün <mic@digikod.net> > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > --- > kernel/bpf/syscall.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index 5bdb0cc84ad2..e24aa3241387 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c > @@ -709,10 +709,7 @@ static int map_update_elem(union bpf_attr *attr) > err = bpf_percpu_hash_update(map, key, value, attr->flags); > } else if (map->map_type == BPF_MAP_TYPE_PERCPU_ARRAY) { > err = bpf_percpu_array_update(map, key, value, attr->flags); > - } else if (map->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || > - map->map_type == BPF_MAP_TYPE_PROG_ARRAY || > - map->map_type == BPF_MAP_TYPE_CGROUP_ARRAY || > - map->map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS) { > + } else if (IS_FD_ARRAY(map)) { Applied to bpf-next, thank you Mickael.
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 5bdb0cc84ad2..e24aa3241387 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -709,10 +709,7 @@ static int map_update_elem(union bpf_attr *attr) err = bpf_percpu_hash_update(map, key, value, attr->flags); } else if (map->map_type == BPF_MAP_TYPE_PERCPU_ARRAY) { err = bpf_percpu_array_update(map, key, value, attr->flags); - } else if (map->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || - map->map_type == BPF_MAP_TYPE_PROG_ARRAY || - map->map_type == BPF_MAP_TYPE_CGROUP_ARRAY || - map->map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS) { + } else if (IS_FD_ARRAY(map)) { rcu_read_lock(); err = bpf_fd_array_map_update_elem(map, f.file, key, value, attr->flags);
Make the code more readable. Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> --- kernel/bpf/syscall.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)