Skip to content

Commit 4a01b9a

Browse files
aspskKernel Patches Daemon
authored andcommitted
libbpf: fix formatting of bpf_object__append_subprog_code
The commit 6c91870 ("libbpf: Refactor bpf_object__reloc_code") added the bpf_object__append_subprog_code() with incorrect indentations. Use tabs instead. (This also makes a consequent commit better readable.) Signed-off-by: Anton Protopopov <[email protected]> Acked-by: Andrii Nakryiko <[email protected]>
1 parent 93adf70 commit 4a01b9a

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

tools/lib/bpf/libbpf.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6440,32 +6440,32 @@ static int
64406440
bpf_object__append_subprog_code(struct bpf_object *obj, struct bpf_program *main_prog,
64416441
struct bpf_program *subprog)
64426442
{
6443-
struct bpf_insn *insns;
6444-
size_t new_cnt;
6445-
int err;
6446-
6447-
subprog->sub_insn_off = main_prog->insns_cnt;
6448-
6449-
new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
6450-
insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
6451-
if (!insns) {
6452-
pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
6453-
return -ENOMEM;
6454-
}
6455-
main_prog->insns = insns;
6456-
main_prog->insns_cnt = new_cnt;
6457-
6458-
memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
6459-
subprog->insns_cnt * sizeof(*insns));
6460-
6461-
pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
6462-
main_prog->name, subprog->insns_cnt, subprog->name);
6463-
6464-
/* The subprog insns are now appended. Append its relos too. */
6465-
err = append_subprog_relos(main_prog, subprog);
6466-
if (err)
6467-
return err;
6468-
return 0;
6443+
struct bpf_insn *insns;
6444+
size_t new_cnt;
6445+
int err;
6446+
6447+
subprog->sub_insn_off = main_prog->insns_cnt;
6448+
6449+
new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
6450+
insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
6451+
if (!insns) {
6452+
pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
6453+
return -ENOMEM;
6454+
}
6455+
main_prog->insns = insns;
6456+
main_prog->insns_cnt = new_cnt;
6457+
6458+
memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
6459+
subprog->insns_cnt * sizeof(*insns));
6460+
6461+
pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
6462+
main_prog->name, subprog->insns_cnt, subprog->name);
6463+
6464+
/* The subprog insns are now appended. Append its relos too. */
6465+
err = append_subprog_relos(main_prog, subprog);
6466+
if (err)
6467+
return err;
6468+
return 0;
64696469
}
64706470

64716471
static int

0 commit comments

Comments
 (0)