A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

tools: bpftool: remove duplicated error message on prog load

Browse source 
do_pin_fd() will already print out an error message if something
goes wrong.  Printing another error is unnecessary and will break
JSON output, since error messages are full objects:

$ bpftool -jp prog load tracex1_kern.o /sys/fs/bpf/a
{
    "error": "can't pin the object (/sys/fs/bpf/a): File exists"
},{
    "error": "failed to pin program"
}

Fixes: 49a086c201 ("bpftool: implement prog load command")
Signed-off-by: Jakub Kicinski <[email protected]>
Reviewed-by: Quentin Monnet <[email protected]>
Acked-by: Song Liu <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
This commit is contained in:
Jakub Kicinski 2018-06-20 11:42:45 -07:00 • committed by Daniel Borkmann
commit 957f9a13df
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/bpf/bpftool/prog.c
View file

@ -694,10 +694,8 @@ static int do_load(int argc, char **argv)
return -1;
}
if (do_pin_fd(prog_fd, argv[1])) {
p_err("failed to pin program");
if (do_pin_fd(prog_fd, argv[1]))
return -1;
}
if (json_output)
jsonw_null(json_wtr);