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 <[email protected]>
Reviewed-by: Matt Fleming <[email protected]>
Cc: Raphael Beamonte <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index b857fcbd00cf291f9dc7d8473e36cdadeac81987..07dbff5c0e60ea10b0c330b194e234666b84f6c5 100644 (file)
--- 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 d33c34196a5a9d2a38d773470b84621b794c100b..7acafb3c5592d60501561986b1812fb6b121f271 100644 (file)
--- 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);
 }