libbpf: Name changing for btf_get_from_id

s/btf_get_from_id/btf__get_from_id/ to restore the API naming convention.

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index cbd3080e72c77afbdb377eef8a483868acb9b17e..3850f8d65703043d1e44f3a693eda0f68c5c52f4 100644 (file)
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -713,7 +713,7 @@ static int do_dump(int argc, char **argv)
 
        prev_key = NULL;
 
-       err = btf_get_from_id(info.btf_id, &btf);
+       err = btf__get_from_id(info.btf_id, &btf);
        if (err) {
                p_err("failed to get btf");
                goto exit_free;
@@ -857,7 +857,7 @@ static int do_lookup(int argc, char **argv)
        }
 
        /* here means bpf_map_lookup_elem() succeeded */
-       err = btf_get_from_id(info.btf_id, &btf);
+       err = btf__get_from_id(info.btf_id, &btf);
        if (err) {
                p_err("failed to get btf");
                goto exit_free;

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 37b1daf19da6023fa3305e4c2425bd2ac2de42fd..521a1073d1b4090c7c0163c6fe2f3f76fce98930 100644 (file)
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv)
                goto err_free;
        }
 
-       if (info.btf_id && btf_get_from_id(info.btf_id, &btf)) {
+       if (info.btf_id && btf__get_from_id(info.btf_id, &btf)) {
                p_err("failed to get btf");
                goto err_free;
        }

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 13ddc4bd24ee365c9abfd0b7ca80c23b97d55101..eadcf8dfd29584e1af1a3ecd6057363aee62f87c 100644 (file)
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -415,7 +415,7 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
                return NULL;
 }
 
-int btf_get_from_id(__u32 id, struct btf **btf)
+int btf__get_from_id(__u32 id, struct btf **btf)
 {
        struct bpf_btf_info btf_info = { 0 };
        __u32 len = sizeof(btf_info);

diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
index 701ad2b6c41fe7b71cd412db3cd34d0e5b7d26f5..5336b2f37293a94c6a3f51d4bc85c2a2c03ac06a 100644 (file)
--- a/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@ -73,7 +73,7 @@ LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__fd(const struct btf *btf);
 LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
-LIBBPF_API int btf_get_from_id(__u32 id, struct btf **btf);
+LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);
 
 struct btf_ext *btf_ext__new(__u8 *data, __u32 size, btf_print_fn_t err_log);
 void btf_ext__free(struct btf_ext *btf_ext);

diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c
index b4c8725b3004ccb34079f91c49f5ab3890737923..bae7308b7ec5188e25983c2ea1fd988216bbf8f7 100644 (file)
--- a/tools/testing/selftests/bpf/test_btf.c
+++ b/tools/testing/selftests/bpf/test_btf.c
@@ -2585,7 +2585,7 @@ static int do_test_file(unsigned int test_num)
                goto done;
        }
 
-       err = btf_get_from_id(info.btf_id, &btf);
+       err = btf__get_from_id(info.btf_id, &btf);
        if (CHECK(err, "cannot get btf from kernel, err: %d", err))
                goto done;