From: Mickaël Salaün Date: Thu, 25 Jan 2018 23:54:02 +0000 (+0100) Subject: bpf: Use the IS_FD_ARRAY() macro in map_update_elem() X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~6057^2~33^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9c147b56fc7165856da9c510463fafc2f0d58d5f;p=mirror_ubuntu-focal-kernel.git bpf: Use the IS_FD_ARRAY() macro in map_update_elem() Make the code more readable. Signed-off-by: Mickaël Salaün Cc: Alexei Starovoitov Cc: Daniel Borkmann Signed-off-by: Alexei Starovoitov --- 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);