Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753056AbbHaIdW (ORCPT ); Mon, 31 Aug 2015 04:33:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37912 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753023AbbHaIdT (ORCPT ); Mon, 31 Aug 2015 04:33:19 -0400 Date: Mon, 31 Aug 2015 01:33:00 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: raphael.beamonte@gmail.com, tglx@linutronix.de, jolsa@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, matt@codeblueprint.co.uk, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, jolsa@kernel.org, tglx@linutronix.de, raphael.beamonte@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, matt@codeblueprint.co.uk In-Reply-To: <1440596813-12844-4-git-send-email-jolsa@kernel.org> References: <1440596813-12844-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Do not change lib/api/fs/ debugfs directly Git-Commit-ID: 9f30fffc78ca35c862f74f34cc597c7fdddc8793 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2186 Lines: 55 Commit-ID: 9f30fffc78ca35c862f74f34cc597c7fdddc8793 Gitweb: http://git.kernel.org/tip/9f30fffc78ca35c862f74f34cc597c7fdddc8793 Author: Jiri Olsa AuthorDate: Wed, 26 Aug 2015 15:46:45 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 28 Aug 2015 14:53:53 -0300 perf tools: Do not change lib/api/fs/debugfs directly The tracing_events_path is the variable we want to change via --debugfs-dir option, not the debugfs_mountpoint. Signed-off-by: Jiri Olsa Reviewed-by: Matt Fleming Cc: Raphael Beamonte Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1440596813-12844-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf.c | 2 +- tools/perf/util/util.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index b857fcb..07dbff5 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -231,7 +231,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) (*argc)--; } else if (!prefixcmp(cmd, CMD_DEBUGFS_DIR)) { perf_debugfs_set_path(cmd + strlen(CMD_DEBUGFS_DIR)); - fprintf(stderr, "dir: %s\n", debugfs_mountpoint); + fprintf(stderr, "dir: %s\n", tracing_path); if (envchanged) *envchanged = 1; } else if (!strcmp(cmd, "--list-cmds")) { diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index d33c341..7acafb3 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -439,7 +439,6 @@ const char *perf_debugfs_mount(const char *mountpoint) void perf_debugfs_set_path(const char *mntpt) { - snprintf(debugfs_mountpoint, strlen(debugfs_mountpoint), "%s", mntpt); set_tracing_events_path("tracing/", mntpt); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/