Merge branch 'rename-info_cnt-to-nr_info'
authorAlexei Starovoitov <ast@kernel.org>
Mon, 10 Dec 2018 22:51:45 +0000 (14:51 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 10 Dec 2018 22:51:46 +0000 (14:51 -0800)
commitaa570ff4fd3682d35cdcc5190c380e6c4d7d08e2
tree5821df7fea9335a55010c21dcfba92e704c92d32
parent7a5725ddc6e18aab61f647c0996d3b7eb03ff5cb
parentcfc542411bd40ff4f8a70b3d061bd6acdfb05629
Merge branch 'rename-info_cnt-to-nr_info'

Yonghong Song says:

====================
Before func_info and line_info are added to the kernel, there are several
fields in structure bpf_prog_info specifying the "count" of a user buffer, e.g.,
        __u32 nr_jited_ksyms;
        __u32 nr_jited_func_lens;
The naming convention has the prefix "nr_".

The func_info and line_info support added several fields
        __u32 func_info_cnt;
        __u32 line_info_cnt;
        __u32 jited_line_info_cnt;
to indicate the "count" of buffers func_info, line_info and jited_line_info.
The original intention is to keep the field names the same as those in
structure bpf_attr, so it will be clear that the "count" returned to user
space will be the same as the one passed to the kernel during prog load.

Unfortunately, the field names *_info_cnt are not consistent with
other existing fields in bpf_prog_info.
This patch set renamed the fields *_info_cnt to nr_*_info
to keep naming convention consistent.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>