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>
This commit is contained in:
parent
379d19ecdc
commit
61afd3da08
|
@ -413,7 +413,7 @@ static void fixup_map(struct bpf_object *obj)
|
|||
for (i = 0; i < NR_TESTS; i++) {
|
||||
if (!strcmp(test_map_names[i], name) &&
|
||||
(check_test_flags(i))) {
|
||||
bpf_map__resize(map, num_map_entries);
|
||||
bpf_map__set_max_entries(map, num_map_entries);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ static void print_avail_progs(struct bpf_object *obj)
|
|||
|
||||
printf(" Programs to be used for -p/--progname:\n");
|
||||
bpf_object__for_each_program(pos, obj) {
|
||||
if (bpf_program__is_xdp(pos)) {
|
||||
if (bpf_program__type(pos) == BPF_PROG_TYPE_XDP) {
|
||||
if (!strncmp(bpf_program__name(pos), "xdp_prognum",
|
||||
sizeof("xdp_prognum") - 1))
|
||||
printf(" %s\n", bpf_program__name(pos));
|
||||
|
|
|
@ -1218,7 +1218,7 @@ int sample_setup_maps(struct bpf_map **maps)
|
|||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
if (bpf_map__resize(sample_map[i], sample_map_count[i]) < 0)
|
||||
if (bpf_map__set_max_entries(sample_map[i], sample_map_count[i]) < 0)
|
||||
return -errno;
|
||||
}
|
||||
sample_map[MAP_DEVMAP_XMIT_MULTI] = maps[MAP_DEVMAP_XMIT_MULTI];
|
||||
|
|
|
@ -61,7 +61,7 @@ static inline char *safe_strncpy(char *dst, const char *src, size_t size)
|
|||
|
||||
#define __attach_tp(name) \
|
||||
({ \
|
||||
if (!bpf_program__is_tracing(skel->progs.name)) \
|
||||
if (bpf_program__type(skel->progs.name) != BPF_PROG_TYPE_TRACING)\
|
||||
return -EINVAL; \
|
||||
skel->links.name = bpf_program__attach(skel->progs.name); \
|
||||
if (!skel->links.name) \
|
||||
|
|
Loading…
Reference in New Issue