Skip to contentSkip to conversation

bpf: Make function btf_name_offset_valid static

PATCH Applied Mathieu Malaterre 3 participants 3 messages Jan 16, 2019 – Jan 17, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: Make function btf_name_offset_valid static

Initially in commit 69b693f0aefa ("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 c454a46b5efd ("bpf: Add bpf_line_info support") 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]

---
 kernel/bpf/btf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
index a2f53642592b..befe570be5ba 100644
@@ -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;
Signature · 1 line
2.19.2
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Mathieu Malaterre

Initially in commit 69b693f0aefa ("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 c454a46b5efd ("bpf: Add bpf_line_info support") the function prototype was removed.

Instead of c454a46b5efd, it was removed from btf.h in
commit 23127b33ec80 ("bpf: Create a new btf_name_by_offset() for non type name use case")

Quoted 7 lines

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 23127b33ec80 ("bpf: Create a new btf_name_by_offset() for non type name use case")

Thanks for the fix!

Other than the above,

maintainer Applied
#2 lore raw
Quoted 15 lines · Martin Lau
Quoted 5 lines · Mathieu Malaterre

Initially in commit 69b693f0aefa ("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 c454a46b5efd ("bpf: Add bpf_line_info support") the function prototype was removed.

Instead of c454a46b5efd, it was removed from btf.h in
commit 23127b33ec80 ("bpf: Create a new btf_name_by_offset() for non type name use case")

Quoted 6 lines

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]

Quoted 8 lines
Quoted 1 line
Fixes 23127b33ec80 ("bpf: Create a new btf_name_by_offset() for non type name use case")

Thanks for the fix!

Other than the above,

Applied to bpf and fixed up commit reference. Thanks!