diff options
| author |   Quentin Monnet <quentin@isovalent.com> | 2021-07-29 17:20:25 +0100 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-07-29 17:23:52 -0700 |
| commit | 86f4b7f2578f69284fa782be54e700c42c757897 (patch) | |
| tree | 9944eb0e0bfd66dae5ccbe9d91b8c0beed0ace82 /tools/bpf/bpftool/btf.c | |
| parent | tools: Free BTF objects at various locations (diff) | |
| download | linux-dev-86f4b7f2578f69284fa782be54e700c42c757897.tar.xz linux-dev-86f4b7f2578f69284fa782be54e700c42c757897.zip | |
tools: Replace btf__get_from_id() with btf__load_from_kernel_by_id()
Replace the calls to function btf__get_from_id(), which we plan to
deprecate before the library reaches v1.0, with calls to
btf__load_from_kernel_by_id() in tools/ (bpftool, perf, selftests).
Update the surrounding code accordingly (instead of passing a pointer to
the btf struct, get it as a return value from the function).
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210729162028.29512-6-quentin@isovalent.com
Diffstat (limited to 'tools/bpf/bpftool/btf.c')
| -rw-r--r-- | tools/bpf/bpftool/btf.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c index 385d5c955cf3..9162a18e84c0 100644 --- a/tools/bpf/bpftool/btf.c +++ b/tools/bpf/bpftool/btf.c @@ -580,16 +580,12 @@ static int do_dump(int argc, char **argv) } if (!btf) { - err = btf__get_from_id(btf_id, &btf); + btf = btf__load_from_kernel_by_id(btf_id); + err = libbpf_get_error(btf); if (err) { p_err("get btf by id (%u): %s", btf_id, strerror(err)); goto done; } - if (!btf) { - err = -ENOENT; - p_err("can't find btf with ID (%u)", btf_id); - goto done; - } } if (dump_c) { |