On Sun, Oct 9, 2022 at 3:00 PM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> Renaming __bpf_kprobe_multi_cookie_cmp to bpf_kprobe_multi_addrs_cmp,
> because it's more suitable to current and upcoming code.
>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Acked-by: Song Liu <song@xxxxxxxxxx>
> ---
> kernel/trace/bpf_trace.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index 688552df95ca..9be1a2b6b53b 100644
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -2545,7 +2545,7 @@ static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const void
> swap(*cookie_a, *cookie_b);
> }
>
> -static int __bpf_kprobe_multi_cookie_cmp(const void *a, const void *b)
> +static int bpf_kprobe_multi_addrs_cmp(const void *a, const void *b)
> {
> const unsigned long *addr_a = a, *addr_b = b;
>
> @@ -2556,7 +2556,7 @@ static int __bpf_kprobe_multi_cookie_cmp(const void *a, const void *b)
>
> static int bpf_kprobe_multi_cookie_cmp(const void *a, const void *b, const void *priv)
> {
> - return __bpf_kprobe_multi_cookie_cmp(a, b);
> + return bpf_kprobe_multi_addrs_cmp(a, b);
> }
>
> static u64 bpf_kprobe_multi_cookie(struct bpf_run_ctx *ctx)
> @@ -2574,7 +2574,7 @@ static u64 bpf_kprobe_multi_cookie(struct bpf_run_ctx *ctx)
> return 0;
> entry_ip = run_ctx->entry_ip;
> addr = bsearch(&entry_ip, link->addrs, link->cnt, sizeof(entry_ip),
> - __bpf_kprobe_multi_cookie_cmp);
> + bpf_kprobe_multi_addrs_cmp);
> if (!addr)
> return 0;
> cookie = link->cookies + (addr - link->addrs);
> --
> 2.37.3
>
