[PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[Vincent Minet]

The btf__dedup_deprecated name was misspelled in the definition of the
compat symbol for btf__dedup. This leads it to be missing from the
shared library.

This fixes it.

Signed-off-by: Vincent Minet <vincent@vincent-minet.net>
---
 tools/lib/bpf/btf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index e171424192ae..9aa19c89f758 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -3107,7 +3107,7 @@ int btf__dedup_v0_6_0(struct btf *btf, const struct btf_dedup_opts *opts)
 	return libbpf_err(err);
 }
 
-COMPAT_VERSION(bpf__dedup_deprecated, btf__dedup, LIBBPF_0.0.2)
+COMPAT_VERSION(btf__dedup_deprecated, btf__dedup, LIBBPF_0.0.2)
 int btf__dedup_deprecated(struct btf *btf, struct btf_ext *btf_ext, const void *unused_opts)
 {
 	LIBBPF_OPTS(btf_dedup_opts, opts, .btf_ext = btf_ext);
-- 
2.33.1

Re: [PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[Andrii Nakryiko]

On Thu, Dec 9, 2021 at 10:31 PM Vincent Minet <vincent@vincent-minet.net> wrote:
>
> The btf__dedup_deprecated name was misspelled in the definition of the
> compat symbol for btf__dedup. This leads it to be missing from the
> shared library.
>
> This fixes it.
>
> Signed-off-by: Vincent Minet <vincent@vincent-minet.net>
> ---
>  tools/lib/bpf/btf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
> index e171424192ae..9aa19c89f758 100644
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@ -3107,7 +3107,7 @@ int btf__dedup_v0_6_0(struct btf *btf, const struct btf_dedup_opts *opts)
>         return libbpf_err(err);
>  }
>
> -COMPAT_VERSION(bpf__dedup_deprecated, btf__dedup, LIBBPF_0.0.2)
> +COMPAT_VERSION(btf__dedup_deprecated, btf__dedup, LIBBPF_0.0.2)

Took me a while to even see what changed, it's so subtle :( Thanks for
catching this!

How did you run into this problem? Are you using btf__dedup() for
something? Can you please share some details?

Added

Fixes: 957d350a8b94 ("libbpf: Turn btf_dedup_opts into OPTS-based struct")

and pushed to bpf-next, thanks!

>  int btf__dedup_deprecated(struct btf *btf, struct btf_ext *btf_ext, const void *unused_opts)
>  {
>         LIBBPF_OPTS(btf_dedup_opts, opts, .btf_ext = btf_ext);
> --
> 2.33.1
>

Re: [PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Fri, 10 Dec 2021 07:31:12 +0100 you wrote:
> The btf__dedup_deprecated name was misspelled in the definition of the
> compat symbol for btf__dedup. This leads it to be missing from the
> shared library.
> 
> This fixes it.
> 
> Signed-off-by: Vincent Minet <vincent@vincent-minet.net>
> 
> [...]

Here is the summary with links:
  - libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition
    https://git.kernel.org/bpf/bpf-next/c/666af7064562

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[Vincent Minet]

On Thu, Dec 09, 2021 at 10:48:15PM -0800, Andrii Nakryiko wrote:
>
> How did you run into this problem? Are you using btf__dedup() for
> something? Can you please share some details?
 
I ran into the problem with pahole (built against the shared libbpf).
Nothing more than that.

Re: [PATCH] libbpf: fix typo in btf__dedup@LIBBPF_0.0.2 definition

[Andrii Nakryiko]

On Wed, Dec 15, 2021 at 6:48 PM Vincent Minet <vincent@vincent-minet.net> wrote:
>
> On Thu, Dec 09, 2021 at 10:48:15PM -0800, Andrii Nakryiko wrote:
> >
> > How did you run into this problem? Are you using btf__dedup() for
> > something? Can you please share some details?
>
> I ran into the problem with pahole (built against the shared libbpf).
> Nothing more than that.

I see, ok. I was just wondering if someone else is using btf__dedup()
for something else. Thanks.