public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Oleg Nesterov <oleg@redhat.com>
Subject: [for-next][PATCH 3/7] tracing: Kill call_filter_disable()
Date: Thu, 17 Jul 2014 10:47:10 -0400	[thread overview]
Message-ID: <20140717144752.548414916@goodmis.org> (raw)
In-Reply-To: 20140717144707.625978566@goodmis.org

[-- Attachment #1: 0003-tracing-Kill-call_filter_disable.patch --]
[-- Type: text/plain, Size: 1167 bytes --]

From: Oleg Nesterov <oleg@redhat.com>

It seems that the only purpose of call_filter_disable() is to
make filter_disable() less clear and symmetrical, remove it.

Link: http://lkml.kernel.org/p/20140715184821.GA20498@redhat.com

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/trace_events_filter.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 1edec329be29..54a125c8467a 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -774,17 +774,12 @@ static void __free_preds(struct event_filter *filter)
 	filter->n_preds = 0;
 }
 
-static void call_filter_disable(struct ftrace_event_call *call)
-{
-	call->flags &= ~TRACE_EVENT_FL_FILTERED;
-}
-
 static void filter_disable(struct ftrace_event_file *file)
 {
 	struct ftrace_event_call *call = file->event_call;
 
 	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)
-		call_filter_disable(call);
+		call->flags &= ~TRACE_EVENT_FL_FILTERED;
 	else
 		file->flags &= ~FTRACE_EVENT_FL_FILTERED;
 }
-- 
2.0.1



  parent reply	other threads:[~2014-07-17 14:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-17 14:47 [for-next][PATCH 0/7] tracing: ->filter cleanups Steven Rostedt
2014-07-17 14:47 ` [for-next][PATCH 1/7] tracing: Kill destroy_preds() and destroy_file_preds() Steven Rostedt
2014-07-17 14:47 ` [for-next][PATCH 2/7] tracing: Kill destroy_call_preds() Steven Rostedt
2014-07-17 14:47 ` Steven Rostedt [this message]
2014-07-17 14:47 ` [for-next][PATCH 4/7] tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic Steven Rostedt
2014-07-17 14:47 ` [for-next][PATCH 5/7] tracing: Kill ftrace_event_call->files Steven Rostedt
2014-07-17 14:47 ` [for-next][PATCH 6/7] tracing: Change apply_subsystem_event_filter() paths to check file->system == dir Steven Rostedt
2014-07-17 14:47 ` [for-next][PATCH 7/7] tracing: Kill "filter_string" arg of replace_preds() Steven Rostedt

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=20140717144752.548414916@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=oleg@redhat.com \
    /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