From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035230AbcIWOqV (ORCPT ); Fri, 23 Sep 2016 10:46:21 -0400 Received: from mga05.intel.com ([192.55.52.43]:46070 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035037AbcIWOnl (ORCPT ); Fri, 23 Sep 2016 10:43:41 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,381,1470726000"; d="scan'208";a="1044690147" From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Masami Hiramatsu , Mathieu Poirier , linux-kernel@vger.kernel.org Subject: [PATCH 05/16] perf record: Fix error paths Date: Fri, 23 Sep 2016 17:38:37 +0300 Message-Id: <1474641528-18776-6-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474641528-18776-1-git-send-email-adrian.hunter@intel.com> References: <1474641528-18776-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some error paths do not tidy-up. Fix that. Signed-off-by: Adrian Hunter --- 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 b32a880ec473..962adcfc43a5 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; -- 1.9.1