diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-07-15 14:48:32 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-16 14:58:53 -0400 |
commit | 6355d54438bfc3b636cb6453cd091f782fb9b4d7 (patch) | |
tree | f195846be3b17857999ecf6b8659a6b0c312d755 | |
parent | bb9ef1cb7d8668d6b0038b6f9f783c849135e40d (diff) |
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.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | 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 c2ef5a5f21da..7a8c1528e141 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, | |||
1546 | static int replace_preds(struct ftrace_event_call *call, | 1546 | static int replace_preds(struct ftrace_event_call *call, |
1547 | struct event_filter *filter, | 1547 | struct event_filter *filter, |
1548 | struct filter_parse_state *ps, | 1548 | struct filter_parse_state *ps, |
1549 | char *filter_string, | ||
1550 | bool dry_run) | 1549 | bool dry_run) |
1551 | { | 1550 | { |
1552 | char *operand1 = NULL, *operand2 = NULL; | 1551 | char *operand1 = NULL, *operand2 = NULL; |
@@ -1739,8 +1738,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir, | |||
1739 | * Try to see if the filter can be applied | 1738 | * Try to see if the filter can be applied |
1740 | * (filter arg is ignored on dry_run) | 1739 | * (filter arg is ignored on dry_run) |
1741 | */ | 1740 | */ |
1742 | err = replace_preds(file->event_call, NULL, ps, | 1741 | err = replace_preds(file->event_call, NULL, ps, true); |
1743 | filter_string, true); | ||
1744 | if (err) | 1742 | if (err) |
1745 | event_set_no_set_filter_flag(file); | 1743 | event_set_no_set_filter_flag(file); |
1746 | else | 1744 | else |
@@ -1772,8 +1770,7 @@ static int replace_system_preds(struct ftrace_subsystem_dir *dir, | |||
1772 | if (err) | 1770 | if (err) |
1773 | goto fail_mem; | 1771 | goto fail_mem; |
1774 | 1772 | ||
1775 | err = replace_preds(file->event_call, filter, ps, | 1773 | err = replace_preds(file->event_call, filter, ps, false); |
1776 | filter_string, false); | ||
1777 | if (err) { | 1774 | if (err) { |
1778 | filter_disable(file); | 1775 | filter_disable(file); |
1779 | parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0); | 1776 | parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0); |
@@ -1895,7 +1892,7 @@ static int create_filter(struct ftrace_event_call *call, | |||
1895 | 1892 | ||
1896 | err = create_filter_start(filter_str, set_str, &ps, &filter); | 1893 | err = create_filter_start(filter_str, set_str, &ps, &filter); |
1897 | if (!err) { | 1894 | if (!err) { |
1898 | err = replace_preds(call, filter, ps, filter_str, false); | 1895 | err = replace_preds(call, filter, ps, false); |
1899 | if (err && set_str) | 1896 | if (err && set_str) |
1900 | append_filter_err(ps, filter); | 1897 | append_filter_err(ps, filter); |
1901 | } | 1898 | } |