OSDN Git Service

libbpf: Remove the duplicate checking of function storage
authorTaeung Song <treeze.taeung@gmail.com>
Sun, 2 Sep 2018 23:30:07 +0000 (08:30 +0900)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 6 Sep 2018 05:16:00 +0000 (22:16 -0700)
After the commit eac7d84519a3 ("tools: libbpf: don't return '.text'
as a program for multi-function programs"), bpf_program__next()
in bpf_object__for_each_program skips the function storage such as .text,
so eliminate the duplicate checking.

Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/lib/bpf/libbpf.c

index 2abd0f1..8476da7 100644 (file)
@@ -2336,7 +2336,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
                bpf_program__set_expected_attach_type(prog,
                                                      expected_attach_type);
 
-               if (!bpf_program__is_function_storage(prog, obj) && !first_prog)
+               if (!first_prog)
                        first_prog = prog;
        }