From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932937Ab1LFGZd (ORCPT ); Tue, 6 Dec 2011 01:25:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:33888 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932847Ab1LFGZc (ORCPT ); Tue, 6 Dec 2011 01:25:32 -0500 Date: Mon, 5 Dec 2011 22:25:17 -0800 From: tip-bot for Ilya Dryomov Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, idryomov@gmail.com, rostedt@goodmis.org, tglx@linutronix.de Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, idryomov@gmail.com, rostedt@goodmis.org, tglx@linutronix.de In-Reply-To: <1320052062-7846-1-git-send-email-idryomov@gmail.com> References: <1320052062-7846-1-git-send-email-idryomov@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tracing: fix event_subsystem ref counting Git-Commit-ID: cb59974742aea24adf6637eb0c4b8e7b48bca6fb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Mon, 05 Dec 2011 22:25:22 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cb59974742aea24adf6637eb0c4b8e7b48bca6fb Gitweb: http://git.kernel.org/tip/cb59974742aea24adf6637eb0c4b8e7b48bca6fb Author: Ilya Dryomov AuthorDate: Mon, 31 Oct 2011 11:07:42 +0200 Committer: Steven Rostedt 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@vger.kernel.org Signed-off-by: Ilya Dryomov Link: http://lkml.kernel.org/r/1320052062-7846-1-git-send-email-idryomov@gmail.com Signed-off-by: Steven Rostedt --- 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; }