From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: raphael.beamonte@gmail.com, tglx@linutronix.de,
a.p.zijlstra@chello.nl, mingo@kernel.org,
linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk,
jolsa@kernel.org, hpa@zytor.com, dsahern@gmail.com,
rostedt@goodmis.org, namhyung@kernel.org, acme@redhat.com
Subject: [tip:perf/core] perf tools: Remove mountpoint arg from perf_debugfs_mount
Date: Tue, 8 Sep 2015 07:32:46 -0700 [thread overview]
Message-ID: <tip-f6a09af7de3b39b1e4fcff7374871f834498b7f0@git.kernel.org> (raw)
In-Reply-To: <1441180605-24737-3-git-send-email-jolsa@kernel.org>
Commit-ID: f6a09af7de3b39b1e4fcff7374871f834498b7f0
Gitweb: http://git.kernel.org/tip/f6a09af7de3b39b1e4fcff7374871f834498b7f0
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 2 Sep 2015 09:56:32 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 2 Sep 2015 16:30:47 -0300
perf tools: Remove mountpoint arg from perf_debugfs_mount
It's not used by any caller. We either detect the mountpoint or use
hardcoded one.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1441180605-24737-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/perf.c | 2 +-
tools/perf/util/util.c | 14 +++++++-------
tools/perf/util/util.h | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 07dbff5..f500a4b 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -518,7 +518,7 @@ int main(int argc, const char **argv)
if (!cmd)
cmd = "perf-help";
/* get debugfs mount point from /proc/mounts */
- perf_debugfs_mount(NULL);
+ perf_debugfs_mount();
/*
* "perf-xxxx" is the same as "perf xxxx", but we obviously:
*
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 7acafb3..74f71f8 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -398,11 +398,11 @@ static void set_tracing_events_path(const char *tracing, const char *mountpoint)
mountpoint, tracing, "events");
}
-static const char *__perf_tracefs_mount(const char *mountpoint)
+static const char *__perf_tracefs_mount(void)
{
const char *mnt;
- mnt = tracefs_mount(mountpoint);
+ mnt = tracefs_mount(NULL);
if (!mnt)
return NULL;
@@ -411,11 +411,11 @@ static const char *__perf_tracefs_mount(const char *mountpoint)
return mnt;
}
-static const char *__perf_debugfs_mount(const char *mountpoint)
+static const char *__perf_debugfs_mount(void)
{
const char *mnt;
- mnt = debugfs_mount(mountpoint);
+ mnt = debugfs_mount(NULL);
if (!mnt)
return NULL;
@@ -424,15 +424,15 @@ static const char *__perf_debugfs_mount(const char *mountpoint)
return mnt;
}
-const char *perf_debugfs_mount(const char *mountpoint)
+const char *perf_debugfs_mount(void)
{
const char *mnt;
- mnt = __perf_tracefs_mount(mountpoint);
+ mnt = __perf_tracefs_mount();
if (mnt)
return mnt;
- mnt = __perf_debugfs_mount(mountpoint);
+ mnt = __perf_debugfs_mount();
return mnt;
}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 09c1a8b..48ec232 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -86,7 +86,7 @@ extern char buildid_dir[];
extern char tracing_path[];
extern char tracing_events_path[];
extern void perf_debugfs_set_path(const char *mountpoint);
-const char *perf_debugfs_mount(const char *mountpoint);
+const char *perf_debugfs_mount(void);
char *get_tracing_file(const char *name);
void put_tracing_file(char *file);
next prev parent reply other threads:[~2015-09-08 14:37 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 7:56 [PATCH 00/15] perf tools: Cleanup filesystem api Jiri Olsa
2015-09-02 7:56 ` [PATCH 01/15] perf tools: Fix parse_events_add_pmu caller Jiri Olsa
2015-09-02 13:00 ` Arnaldo Carvalho de Melo
2015-09-02 13:34 ` Jiri Olsa
2015-09-05 14:00 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 02/15] perf tools: Remove mountpoint arg from perf_debugfs_mount Jiri Olsa
2015-09-08 14:32 ` tip-bot for Jiri Olsa [this message]
2015-09-02 7:56 ` [PATCH 03/15] perf tools: Move tracing_path stuff under same namespace Jiri Olsa
2015-09-08 14:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 04/15] perf tools: Move tracing_path interface into api/fs/tracing_path.c Jiri Olsa
2015-09-04 11:35 ` Matt Fleming
2015-09-04 13:28 ` Raphaël Beamonte
2015-09-08 14:33 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 05/15] tools lib api: Move debugfs__strerror_open into tracing_path.c object Jiri Olsa
2015-09-02 13:12 ` Arnaldo Carvalho de Melo
2015-09-04 11:36 ` Matt Fleming
2015-09-04 13:41 ` Raphaël Beamonte
2015-09-04 13:48 ` Jiri Olsa
2015-09-04 13:51 ` Raphaël Beamonte
2015-09-08 14:33 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 06/15] tools lib api: Make tracing_path_strerror_open message generic Jiri Olsa
2015-09-02 13:18 ` Arnaldo Carvalho de Melo
2015-09-02 13:44 ` Jiri Olsa
2015-09-02 14:16 ` Arnaldo Carvalho de Melo
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 07/15] tools lib api: Add STR and PATH_MAX macros to fs object Jiri Olsa
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 08/15] tools lib api: Move SYSFS_MAGIC PROC_SUPER_MAGIC into fs.c Jiri Olsa
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 09/15] tools lib api: Add debugfs into fs.c object Jiri Olsa
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 10/15] tools lib api: Add tracefs " Jiri Olsa
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 11/15] tools lib api: Add mount support for fs Jiri Olsa
2015-09-04 14:14 ` Raphaël Beamonte
2015-09-04 14:20 ` Steven Rostedt
2015-09-04 14:26 ` Jiri Olsa
2015-09-04 14:57 ` Steven Rostedt
2015-09-04 15:00 ` Steven Rostedt
2015-09-04 15:12 ` Raphaël Beamonte
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: Add FSTYPE__mount() method tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 12/15] tools lib api: Add configured support for fs Jiri Olsa
2015-09-02 13:39 ` Arnaldo Carvalho de Melo
2015-09-02 13:41 ` Arnaldo Carvalho de Melo
2015-09-02 13:46 ` Jiri Olsa
2015-09-02 14:17 ` Arnaldo Carvalho de Melo
2015-09-02 16:52 ` Arnaldo Carvalho de Melo
2015-09-04 7:08 ` Jiri Olsa
2015-09-04 16:42 ` Arnaldo Carvalho de Melo
2015-09-04 17:45 ` Jiri Olsa
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: Add FSTYPE__configured() method tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 13/15] tools lib api: Replace debugfs/tracefs objects interface with fs.c Jiri Olsa
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: Replace debugfs/ tracefs " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 14/15] tools lib api: Remove debugfs, tracefs and findfs objects Jiri Olsa
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-22 0:20 ` Vinson Lee
2015-09-22 13:53 ` Arnaldo Carvalho de Melo
2015-09-22 21:29 ` Vinson Lee
2015-09-23 8:23 ` Matt Fleming
2015-09-23 8:39 ` Jiri Olsa
2015-09-23 10:08 ` Matt Fleming
2015-09-24 15:05 ` Michael Petlan
2015-10-07 20:10 ` Matt Fleming
2015-10-13 19:18 ` Arnaldo Carvalho de Melo
2015-09-23 13:44 ` Arnaldo Carvalho de Melo
2015-09-23 13:50 ` Jiri Olsa
2015-09-23 13:54 ` Arnaldo Carvalho de Melo
2015-09-24 12:15 ` Matt Fleming
2015-09-24 14:29 ` Arnaldo Carvalho de Melo
2015-09-02 7:56 ` [PATCH 15/15] perf tools: Switch to tracing_path interface on appropriate places Jiri Olsa
2015-09-15 7:00 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-09-02 8:01 ` [PATCH 00/15] perf tools: Cleanup filesystem api Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f6a09af7de3b39b1e4fcff7374871f834498b7f0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=raphael.beamonte@gmail.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).