From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, rostedt@goodmis.org, tglx@linutronix.de,
bp@suse.de
Subject: [tip:perf/core] perf tools: Remove a write-only variable in the debugfs code
Date: Thu, 21 Mar 2013 03:49:27 -0700 [thread overview]
Message-ID: <tip-fed1208841f5db92cc3bede4b1004e9e986d843e@git.kernel.org> (raw)
In-Reply-To: <1361374353-30385-2-git-send-email-bp@alien8.de>
Commit-ID: fed1208841f5db92cc3bede4b1004e9e986d843e
Gitweb: http://git.kernel.org/tip/fed1208841f5db92cc3bede4b1004e9e986d843e
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 20 Feb 2013 16:32:27 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 15 Mar 2013 13:05:58 -0300
perf tools: Remove a write-only variable in the debugfs code
debugfs_premounted is written-to only so drop it. This functionality is
covered by debugfs_found now. Make it a bool while at it.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1361374353-30385-2-git-send-email-bp@alien8.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/debugfs.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/debugfs.c b/tools/perf/util/debugfs.c
index dd8b193..e55495c 100644
--- a/tools/perf/util/debugfs.c
+++ b/tools/perf/util/debugfs.c
@@ -5,7 +5,6 @@
#include <linux/kernel.h>
#include <sys/mount.h>
-static int debugfs_premounted;
char debugfs_mountpoint[PATH_MAX + 1] = "/sys/kernel/debug";
char tracing_events_path[PATH_MAX + 1] = "/sys/kernel/debug/tracing/events";
@@ -15,7 +14,7 @@ static const char *debugfs_known_mountpoints[] = {
0,
};
-static int debugfs_found;
+static bool debugfs_found;
/* find the path to the mounted debugfs */
const char *debugfs_find_mountpoint(void)
@@ -30,7 +29,7 @@ const char *debugfs_find_mountpoint(void)
ptr = debugfs_known_mountpoints;
while (*ptr) {
if (debugfs_valid_mountpoint(*ptr) == 0) {
- debugfs_found = 1;
+ debugfs_found = true;
strcpy(debugfs_mountpoint, *ptr);
return debugfs_mountpoint;
}
@@ -52,7 +51,7 @@ const char *debugfs_find_mountpoint(void)
if (strcmp(type, "debugfs") != 0)
return NULL;
- debugfs_found = 1;
+ debugfs_found = true;
return debugfs_mountpoint;
}
@@ -82,10 +81,8 @@ static void debugfs_set_tracing_events_path(const char *mountpoint)
char *debugfs_mount(const char *mountpoint)
{
/* see if it's already mounted */
- if (debugfs_find_mountpoint()) {
- debugfs_premounted = 1;
+ if (debugfs_find_mountpoint())
goto out;
- }
/* if not mounted and no argument */
if (mountpoint == NULL) {
@@ -100,7 +97,7 @@ char *debugfs_mount(const char *mountpoint)
return NULL;
/* save the mountpoint */
- debugfs_found = 1;
+ debugfs_found = true;
strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
out:
debugfs_set_tracing_events_path(debugfs_mountpoint);
next prev parent reply other threads:[~2013-03-21 10:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 15:32 [PATCH 0/7] perf: A tools library Borislav Petkov
2013-02-20 15:32 ` [PATCH 1/7] perf, debugfs: Remove a write-only variable Borislav Petkov
2013-03-21 10:49 ` tip-bot for Borislav Petkov [this message]
2013-02-20 15:32 ` [PATCH 2/7] perf: Honor parallel jobs Borislav Petkov
2013-03-21 10:50 ` [tip:perf/core] perf tools: " tip-bot for Borislav Petkov
2013-02-20 15:32 ` [PATCH 3/7] perf: Correct Makefile.include Borislav Petkov
2013-03-21 10:51 ` [tip:perf/core] perf tools: " tip-bot for Borislav Petkov
2013-02-20 15:32 ` [PATCH 4/7] perf: Carve out debugfs Borislav Petkov
2013-03-21 11:00 ` [tip:perf/core] perf tools: Introduce tools/lib/lk library tip-bot for Borislav Petkov
2013-02-20 15:32 ` [PATCH 5/7] perf: Extract perf-specific stuff from debugfs.c Borislav Petkov
2013-03-21 11:01 ` [tip:perf/core] perf tools: " tip-bot for Borislav Petkov
2013-02-20 15:32 ` [PATCH 6/7] perf: Do not allow empty debugfs-dir option Borislav Petkov
2013-02-20 15:32 ` [PATCH 7/7] tools/vm: Switch to liblk library Borislav Petkov
2013-03-21 11:02 ` [tip:perf/core] " tip-bot for Borislav Petkov
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-fed1208841f5db92cc3bede4b1004e9e986d843e@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--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