[tip:perf/core] perf record: Fix error paths

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!newsfeed.datemas.de!enother.net!enother.net!news.mixmin.net!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	tip-bot for Adrian Hunter <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf record: Fix error paths
Date	Thu, 29 Sep 2016 20:20:01 +0200
Message-ID	<smO65-7D0-9@gated-at.bofh.it> (permalink)
References	<skzXA-53e-33@gated-at.bofh.it>
Reply-To	jolsa@redhat.com, tglx@linutronix.de, mhiramat@kernel.org, acme@redhat.com, mathieu.poirier@linaro.org, hpa@zytor.com, adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org
Git-Commit-ID	5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	53
Organization	linux.* mail to news gateway
X-Original-Cc	tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, mhiramat@kernel.org, mathieu.poirier@linaro.org, acme@redhat.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org
X-Original-Date	Thu, 29 Sep 2016 11:14:29 -0700
X-Original-Message-ID	<tip-5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1@git.kernel.org>
X-Original-References	<1474641528-18776-6-git-send-email-adrian.hunter@intel.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1493635

Show key headers only | View raw

Commit-ID:  5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1
Gitweb:     http://git.kernel.org/tip/5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1
Author:     Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Fri, 23 Sep 2016 17:38:37 +0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 29 Sep 2016 11:17:01 -0300

perf record: Fix error paths

Some error paths do not tidy-up. Fix that.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: http://lkml.kernel.org/r/1474641528-18776-6-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-record.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index b32a880..962adcf 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1573,23 +1573,23 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (!rec->itr) {
 		rec->itr = auxtrace_record__init(rec->evlist, &err);
 		if (err)
-			return err;
+			goto out;
 	}
 
 	err = auxtrace_parse_snapshot_options(rec->itr, &rec->opts,
 					      rec->opts.auxtrace_snapshot_opts);
 	if (err)
-		return err;
+		goto out;
 
 	if (dry_run)
-		return 0;
+		goto out;
 
 	err = bpf__setup_stdout(rec->evlist);
 	if (err) {
 		bpf__strerror_setup_stdout(rec->evlist, err, errbuf, sizeof(errbuf));
 		pr_err("ERROR: Setup BPF stdout failed: %s\n",
 			 errbuf);
-		return err;
+		goto out;
 	}
 
 	err = -ENOMEM;

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 05/16] perf record: Fix error paths Adrian Hunter <adrian.hunter@intel.com> - 2016-09-23 16:50 +0200
  [tip:perf/core] perf record: Fix error paths tip-bot for Adrian Hunter <tipbot@zytor.com> - 2016-09-29 20:20 +0200

csiph-web