aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>2011-10-04 06:45:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 12:35:53 -0500
commitd59892017c5f6de2fdee221f2a7788696e9f2cda (patch)
tree62e1b10ea11e6bef06dad0064b0e49412ce004b3
parenta847627709b3402163d99f7c6fda4a77bcd6b51b (diff)
perf probe: Fix to show correct error string
commit 44a56040a0037a845d5fa218dffde464579f0cab upstream. Fix perf probe to show correct error string when it fails to delete an event. The write(2) returns -1 if failed, and errno stores real error number. Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@elte.hu> Link: http://lkml.kernel.org/r/20111004104504.14591.41266.stgit@fedora15 Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--tools/perf/util/probe-event.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index f0223166e76..8c50da86885 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1869,8 +1869,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
1869 1869
1870 pr_debug("Writing event: %s\n", buf); 1870 pr_debug("Writing event: %s\n", buf);
1871 ret = write(fd, buf, strlen(buf)); 1871 ret = write(fd, buf, strlen(buf));
1872 if (ret < 0) 1872 if (ret < 0) {
1873 ret = -errno;
1873 goto error; 1874 goto error;
1875 }
1874 1876
1875 printf("Remove event: %s\n", ent->s); 1877 printf("Remove event: %s\n", ent->s);
1876 return 0; 1878 return 0;