summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2018-06-20 11:42:45 -0700
committerDaniel Borkmann <daniel@iogearbox.net>2018-06-21 23:07:12 +0200
commit957f9a13df6c70aac31a1dade5e417c286d6d258 (patch)
tree407c66bf0df05519bb6f4daaf1a68bd6335e62ab /tools
parent3739a21e0ef6ac06f46bd38e81daa95e8cb462bc (diff)
downloadlinux-957f9a13df6c70aac31a1dade5e417c286d6d258.tar.gz
linux-957f9a13df6c70aac31a1dade5e417c286d6d258.tar.bz2
linux-957f9a13df6c70aac31a1dade5e417c286d6d258.zip
tools: bpftool: remove duplicated error message on prog load
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.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Acked-by: Song Liu <songliubraving@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/bpf/bpftool/prog.c4
1 files changed, 1 insertions, 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);