From: Oleg Nesterov <oleg@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
"zhangwei(Jovi)" <jovi.zhangwei@huawei.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 7/7] tracing: kill "filter_string" arg of replace_preds()
Date: Tue, 15 Jul 2014 20:48:32 +0200 [thread overview]
Message-ID: <20140715184832.GA20519@redhat.com> (raw)
In-Reply-To: <20140715184753.GA20470@redhat.com>
Cosmetic, but replace_preds() doesn't need/use "char *filter_string".
Remove it to microsimplify the code.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/trace/trace_events_filter.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c2ef5a5..7a8c152 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1546,7 +1546,6 @@ static int fold_pred_tree(struct event_filter *filter,
static int replace_preds(struct ftrace_event_call *call,
struct event_filter *filter,
struct filter_parse_state *ps,
- char *filter_string,
bool dry_run)
{
char *operand1 = NULL, *operand2 = NULL;
@@ -1739,8 +1738,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir,
* Try to see if the filter can be applied
* (filter arg is ignored on dry_run)
*/
- err = replace_preds(file->event_call, NULL, ps,
- filter_string, true);
+ err = replace_preds(file->event_call, NULL, ps, true);
if (err)
event_set_no_set_filter_flag(file);
else
@@ -1772,8 +1770,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir,
if (err)
goto fail_mem;
- err = replace_preds(file->event_call, filter, ps,
- filter_string, false);
+ err = replace_preds(file->event_call, filter, ps, false);
if (err) {
filter_disable(file);
parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0);
@@ -1895,7 +1892,7 @@ static int create_filter(struct ftrace_event_call *call,
err = create_filter_start(filter_str, set_str, &ps, &filter);
if (!err) {
- err = replace_preds(call, filter, ps, filter_str, false);
+ err = replace_preds(call, filter, ps, false);
if (err && set_str)
append_filter_err(ps, filter);
}
--
1.5.5.1
next prev parent reply other threads:[~2014-07-15 18:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 18:47 [PATCH v2 0/7] tracing: ->filter cleanups Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 1/7] tracing: kill destroy_preds() and destroy_file_preds() Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 2/7] tracing: kill destroy_call_preds() Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 3/7] tracing: kill call_filter_disable() Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 4/7] tracing/uprobes: kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 5/7] tracing: kill ftrace_event_call->files Oleg Nesterov
2014-07-15 18:48 ` [PATCH v2 6/7] tracing: change apply_subsystem_event_filter() paths to check file->system == dir Oleg Nesterov
2014-07-16 18:32 ` Steven Rostedt
2014-07-16 19:12 ` Oleg Nesterov
2014-07-16 19:59 ` Steven Rostedt
2014-07-15 18:48 ` Oleg Nesterov [this message]
2014-07-17 8:05 ` [PATCH v2 0/7] tracing: ->filter cleanups Namhyung Kim
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=20140715184832.GA20519@redhat.com \
--to=oleg@redhat.com \
--cc=jovi.zhangwei@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=tom.zanussi@linux.intel.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