bpf: Make function btf_name_offset_valid static

malaterre · borkmann · commit 583c53185399 · 2019-01-17T16:47:05.000+01:00
Initially in commit 69b693f ("bpf: btf: Introduce BPF Type Format (BTF)") the function 'btf_name_offset_valid' was introduced as static function it was later on changed to a non-static one, and then finally in commit 23127b3 ("bpf: Create a new btf_name_by_offset() for non type name use case") the function prototype was removed. Revert back to original implementation and make the function static. Remove warning triggered with W=1: kernel/bpf/btf.c:470:6: warning: no previous prototype for 'btf_name_offset_valid' [-Wmissing-prototypes] Fixes: 23127b3 ("bpf: Create a new btf_name_by_offset() for non type name use case") Signed-off-by: Mathieu Malaterre <malat@debian.org> Acked-by: Martin KaFai Lau <kafai@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
@@ -467,7 +467,7 @@ static const struct btf_kind_operations *btf_type_ops(const struct btf_type *t)
 	return kind_ops[BTF_INFO_KIND(t->info)];
 }
 
-bool btf_name_offset_valid(const struct btf *btf, u32 offset)
+static bool btf_name_offset_valid(const struct btf *btf, u32 offset)
 {
 	return BTF_STR_OFFSET_VALID(offset) &&
 		offset < btf->hdr.str_len;

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ static const struct btf_kind_operations btf_type_ops(const struct btf_type t)`
`467`	`467`	`return kind_ops[BTF_INFO_KIND(t->info)];`
`468`	`468`	`}`
`469`	`469`
`470`		`-bool btf_name_offset_valid(const struct btf *btf, u32 offset)`
	`470`	`+static bool btf_name_offset_valid(const struct btf *btf, u32 offset)`
`471`	`471`	`{`
`472`	`472`	`return BTF_STR_OFFSET_VALID(offset) &&`
`473`	`473`	`offset < btf->hdr.str_len;`