On Wed, Jun 20, 2018 at 11:42 AM, Jakub Kicinski
<jakub.kicin...@netronome.com> wrote:
> 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: 49a086c201a9 ("bpftool: implement prog load command")
> Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com>
> Reviewed-by: Quentin Monnet <quentin.mon...@netronome.com>
Acked-by: Song Liu <songliubrav...@fb.com>
> ---
> tools/bpf/bpftool/prog.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> index 05f42a46d6ed..12b694fe0404 100644
> --- a/tools/bpf/bpftool/prog.c
> +++ b/tools/bpf/bpftool/prog.c
> @@ -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);
> --
> 2.17.1
>
