[net-next] tools: bpf: fix BTF code added twice to different trees
diff mbox series

Message ID 20180803023027.32721-1-jakub.kicinski@netronome.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series
  • [net-next] tools: bpf: fix BTF code added twice to different trees
Related show

Commit Message

Jakub Kicinski Aug. 3, 2018, 2:30 a.m. UTC
commit 38d5d3b3d5db ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 92b57121ca79 ("bpf: btf: export btf types and name by offset from lib")

has already added to bpf-next/net-next, but in slightly different
location.  Remove the duplicates (to fix build of libbpf).

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
 tools/lib/bpf/btf.c | 17 -----------------
 tools/lib/bpf/btf.h |  1 -
 2 files changed, 18 deletions(-)

Comments

David Miller Aug. 3, 2018, 2:45 a.m. UTC | #1
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Thu,  2 Aug 2018 19:30:27 -0700

> commit 38d5d3b3d5db ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")
> 
> added to the bpf and net trees what
> 
> commit 92b57121ca79 ("bpf: btf: export btf types and name by offset from lib")
> 
> has already added to bpf-next/net-next, but in slightly different
> location.  Remove the duplicates (to fix build of libbpf).
> 
> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

Aha, you beat me to it.

Applied, thanks!

Patch
diff mbox series

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 1622a309f169..09ecf8162f7a 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -37,14 +37,6 @@  struct btf {
 	int fd;
 };
 
-static const char *btf_name_by_offset(const struct btf *btf, __u32 offset)
-{
-	if (offset < btf->hdr->str_len)
-		return &btf->strings[offset];
-	else
-		return NULL;
-}
-
 static int btf_add_type(struct btf *btf, struct btf_type *t)
 {
 	if (btf->types_size - btf->nr_types < 2) {
@@ -401,12 +393,3 @@  const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
 	else
 		return NULL;
 }
-
-const struct btf_type *btf__type_by_id(const struct btf *btf,
-				       __u32 type_id)
-{
-	if (type_id > btf->nr_types)
-		return NULL;
-
-	return btf->types[type_id];
-}
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
index dd8a86eab8ca..43c658ccfc2b 100644
--- a/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@ -22,6 +22,5 @@  __s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
 int btf__resolve_type(const struct btf *btf, __u32 type_id);
 int btf__fd(const struct btf *btf);
 const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
-const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
 
 #endif