summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2011-10-31 11:07:42 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 08:55:52 -0800
commitfedb66b50d774dc687ac5b6f78fbf4b9bee28865 (patch)
treed111fb42e1ed20f7ad89a2fa6a895783372d63de /kernel
parentdf9490f1a5f1019ebf36bd7820ff405ddc06bfa9 (diff)
tracing: fix event_subsystem ref counting
commit cb59974742aea24adf6637eb0c4b8e7b48bca6fb upstream. 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(). Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Link: http://lkml.kernel.org/r/1320052062-7846-1-git-send-email-idryomov@gmail.com Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 581876f9f387..c212a7f934ec 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;
}