Commit 6355d544 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Steven Rostedt

tracing: Kill "filter_string" arg of replace_preds()

Cosmetic, but replace_preds() doesn't need/use "char *filter_string".
Remove it to microsimplify the code.

Link: http://lkml.kernel.org/p/20140715184832.GA20519@redhat.comSigned-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent bb9ef1cb
...@@ -1546,7 +1546,6 @@ static int fold_pred_tree(struct event_filter *filter, ...@@ -1546,7 +1546,6 @@ static int fold_pred_tree(struct event_filter *filter,
static int replace_preds(struct ftrace_event_call *call, static int replace_preds(struct ftrace_event_call *call,
struct event_filter *filter, struct event_filter *filter,
struct filter_parse_state *ps, struct filter_parse_state *ps,
char *filter_string,
bool dry_run) bool dry_run)
{ {
char *operand1 = NULL, *operand2 = NULL; char *operand1 = NULL, *operand2 = NULL;
...@@ -1739,8 +1738,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir, ...@@ -1739,8 +1738,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir,
* Try to see if the filter can be applied * Try to see if the filter can be applied
* (filter arg is ignored on dry_run) * (filter arg is ignored on dry_run)
*/ */
err = replace_preds(file->event_call, NULL, ps, err = replace_preds(file->event_call, NULL, ps, true);
filter_string, true);
if (err) if (err)
event_set_no_set_filter_flag(file); event_set_no_set_filter_flag(file);
else else
...@@ -1772,8 +1770,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir, ...@@ -1772,8 +1770,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir,
if (err) if (err)
goto fail_mem; goto fail_mem;
err = replace_preds(file->event_call, filter, ps, err = replace_preds(file->event_call, filter, ps, false);
filter_string, false);
if (err) { if (err) {
filter_disable(file); filter_disable(file);
parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0); parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0);
...@@ -1895,7 +1892,7 @@ static int create_filter(struct ftrace_event_call *call, ...@@ -1895,7 +1892,7 @@ static int create_filter(struct ftrace_event_call *call,
err = create_filter_start(filter_str, set_str, &ps, &filter); err = create_filter_start(filter_str, set_str, &ps, &filter);
if (!err) { if (!err) {
err = replace_preds(call, filter, ps, filter_str, false); err = replace_preds(call, filter, ps, false);
if (err && set_str) if (err && set_str)
append_filter_err(ps, filter); append_filter_err(ps, filter);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment