From 9f19e96001f72c497391dc95a53d631e5412b718 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Wed, 9 Jun 2021 10:22:55 -0300 Subject: [PATCH] btf_encoder: No need to pass encoder->percpu_secinfo to btf_encoder__add_datasec() As it receives the encoder and can get that field from it. Signed-off-by: Arnaldo Carvalho de Melo --- btf_encoder.c | 2 +- libbtf.c | 4 ++-- libbtf.h | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/btf_encoder.c b/btf_encoder.c index 0c56915..d764eed 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -455,7 +455,7 @@ int btf_encoder__encode(struct btf_encoder *encoder, const char *detached_filena int err; if (gobuffer__size(&encoder->percpu_secinfo) != 0) - btf_encoder__add_datasec(encoder, PERCPU_SECTION, &encoder->percpu_secinfo); + btf_encoder__add_datasec(encoder, PERCPU_SECTION); if (detached_filename == NULL) err = btf__encode_in_elf(encoder->btf, encoder->filename, 0); diff --git a/libbtf.c b/libbtf.c index 53caea1..18d8a68 100644 --- a/libbtf.c +++ b/libbtf.c @@ -540,9 +540,9 @@ int32_t btf_encoder__add_var_secinfo(struct btf_encoder *encoder, uint32_t type, return gobuffer__add(&encoder->percpu_secinfo, &si, sizeof(si)); } -int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char *section_name, - struct gobuffer *var_secinfo_buf) +int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char *section_name) { + struct gobuffer *var_secinfo_buf = &encoder->percpu_secinfo; struct btf *btf = encoder->btf; size_t sz = gobuffer__size(var_secinfo_buf); uint16_t nr_var_secinfo = sz / sizeof(struct btf_var_secinfo); diff --git a/libbtf.h b/libbtf.h index 1a6817a..6439bac 100644 --- a/libbtf.h +++ b/libbtf.h @@ -7,8 +7,6 @@ #ifndef _LIBBTF_H #define _LIBBTF_H -struct gobuffer; - #include #include @@ -31,6 +29,6 @@ int btf_encoder__add_enum_val(struct btf_encoder *encoder, const char *name, int int32_t btf_encoder__add_func_proto(struct btf_encoder *encoder, struct cu *cu, struct ftype *ftype, uint32_t type_id_off); int32_t btf_encoder__add_var(struct btf_encoder *encoder, uint32_t type, const char *name, uint32_t linkage); int32_t btf_encoder__add_var_secinfo(struct btf_encoder *encoder, uint32_t type, uint32_t offset, uint32_t size); -int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char *section_name, struct gobuffer *var_secinfo_buf); +int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char *section_name); #endif /* _LIBBTF_H */