tools/bpf: rename *_info_cnt to nr_*_info

Rename all occurances of *_info_cnt field access
to nr_*_info in tools directory.

The local variables finfo_cnt, linfo_cnt and jited_linfo_cnt
in function do_dump() of tools/bpf/bpftool/prog.c are also
changed to nr_finfo, nr_linfo and nr_jited_linfo to
keep naming convention consistent.

Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/lib/bpf/bpf_prog_linfo.c b/tools/lib/bpf/bpf_prog_linfo.c
index b8af65145408..addd6e9971cc 100644
--- a/tools/lib/bpf/bpf_prog_linfo.c
+++ b/tools/lib/bpf/bpf_prog_linfo.c
@@ -105,7 +105,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
         struct bpf_prog_linfo *prog_linfo;
         __u32 nr_linfo, nr_jited_func;
 
-        nr_linfo = info->line_info_cnt;
+        nr_linfo = info->nr_line_info;
 
         /*
          * Test !info->line_info because the kernel may NULL
@@ -138,7 +138,7 @@ struct bpf_prog_linfo *bpf_prog_linfo__new(const struct bpf_prog_info *info)
         nr_jited_func = info->nr_jited_ksyms;
         if (!nr_jited_func ||
             !info->jited_line_info ||
-            info->jited_line_info_cnt != nr_linfo ||
+            info->nr_jited_line_info != nr_linfo ||
             info->jited_line_info_rec_size < sizeof(__u64) ||
             info->nr_jited_func_lens != nr_jited_func ||
             !info->jited_ksyms ||