Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

samples/bpf: use preferred getters/setters instead of deprecated ones

Use preferred setter and getter APIs instead of deprecated ones.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220124194254.2051434-7-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Andrii Nakryiko and committed by
Alexei Starovoitov
61afd3da 379d19ec

+4 -4
+1 -1
samples/bpf/map_perf_test_user.c
··· 413 413 for (i = 0; i < NR_TESTS; i++) { 414 414 if (!strcmp(test_map_names[i], name) && 415 415 (check_test_flags(i))) { 416 - bpf_map__resize(map, num_map_entries); 416 + bpf_map__set_max_entries(map, num_map_entries); 417 417 continue; 418 418 } 419 419 }
+1 -1
samples/bpf/xdp_redirect_cpu_user.c
··· 70 70 71 71 printf(" Programs to be used for -p/--progname:\n"); 72 72 bpf_object__for_each_program(pos, obj) { 73 - if (bpf_program__is_xdp(pos)) { 73 + if (bpf_program__type(pos) == BPF_PROG_TYPE_XDP) { 74 74 if (!strncmp(bpf_program__name(pos), "xdp_prognum", 75 75 sizeof("xdp_prognum") - 1)) 76 76 printf(" %s\n", bpf_program__name(pos));
+1 -1
samples/bpf/xdp_sample_user.c
··· 1218 1218 default: 1219 1219 return -EINVAL; 1220 1220 } 1221 - if (bpf_map__resize(sample_map[i], sample_map_count[i]) < 0) 1221 + if (bpf_map__set_max_entries(sample_map[i], sample_map_count[i]) < 0) 1222 1222 return -errno; 1223 1223 } 1224 1224 sample_map[MAP_DEVMAP_XMIT_MULTI] = maps[MAP_DEVMAP_XMIT_MULTI];
+1 -1
samples/bpf/xdp_sample_user.h
··· 61 61 62 62 #define __attach_tp(name) \ 63 63 ({ \ 64 - if (!bpf_program__is_tracing(skel->progs.name)) \ 64 + if (bpf_program__type(skel->progs.name) != BPF_PROG_TYPE_TRACING)\ 65 65 return -EINVAL; \ 66 66 skel->links.name = bpf_program__attach(skel->progs.name); \ 67 67 if (!skel->links.name) \