[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-cb59974742aea24adf6637eb0c4b8e7b48bca6fb@git.kernel.org>
Date: Mon, 5 Dec 2011 22:25:17 -0800
From: tip-bot for Ilya Dryomov <idryomov@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
idryomov@...il.com, rostedt@...dmis.org, tglx@...utronix.de
Subject: [tip:perf/core] tracing: fix event_subsystem ref counting
Commit-ID: cb59974742aea24adf6637eb0c4b8e7b48bca6fb
Gitweb: http://git.kernel.org/tip/cb59974742aea24adf6637eb0c4b8e7b48bca6fb
Author: Ilya Dryomov <idryomov@...il.com>
AuthorDate: Mon, 31 Oct 2011 11:07:42 +0200
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Mon, 5 Dec 2011 13:28:44 -0500
tracing: fix event_subsystem ref counting
Fix a bug introduced by e9dbfae5, which prevents event_subsystem from
ever being released.
Ref_count was added to keep track of subsystem users, not for counting
events. Subsystem is created with ref_count = 1, so there is no need to
increment it for every event, we have nr_events for that. Fix this by
touching ref_count only when we actually have a new user -
subsystem_open().
Cc: stable@...r.kernel.org
Signed-off-by: Ilya Dryomov <idryomov@...il.com>
Link: http://lkml.kernel.org/r/1320052062-7846-1-git-send-email-idryomov@gmail.com
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/trace_events.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 581876f..c212a7f 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1078,7 +1078,6 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
/* First see if we did not already create this dir */
list_for_each_entry(system, &event_subsystems, list) {
if (strcmp(system->name, name) == 0) {
- __get_system(system);
system->nr_events++;
return system->entry;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists