From: Alexei Starovoitov Date: Mon, 10 Dec 2018 22:51:45 +0000 (-0800) Subject: Merge branch 'rename-info_cnt-to-nr_info' X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~3867^2~114^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=aa570ff4fd3682d35cdcc5190c380e6c4d7d08e2;p=mirror_ubuntu-focal-kernel.git 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 --- aa570ff4fd3682d35cdcc5190c380e6c4d7d08e2