tracing: Fold filter_check_discard() into its only user

The function filter_check_discard() is small and only called by one user,
its code can be folded into that one caller and make the code a bit less
comlplex.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 6 insertions, 20 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 02f5a5f51d49..1ba54e241c8d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -306,19 +306,6 @@ void trace_array_put(struct trace_array *this_tr)
         mutex_unlock(&trace_types_lock);
 }
 
-int filter_check_discard(struct trace_event_file *file, void *rec,
-                         struct ring_buffer *buffer,
-                         struct ring_buffer_event *event)
-{
-        if (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
-            !filter_match_preds(file->filter, rec)) {
-                ring_buffer_discard_commit(buffer, event);
-                return 1;
-        }
-
-        return 0;
-}
-
 int call_filter_check_discard(struct trace_event_call *call, void *rec,
                               struct ring_buffer *buffer,
                               struct ring_buffer_event *event)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index ee8691c66bfe..0862e7559548 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1065,9 +1065,6 @@ struct trace_subsystem_dir {
         int                             nr_events;
 };
 
-extern int filter_check_discard(struct trace_event_file *file, void *rec,
-                                struct ring_buffer *buffer,
-                                struct ring_buffer_event *event);
 extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
                                      struct ring_buffer *buffer,
                                      struct ring_buffer_event *event);
@@ -1096,12 +1093,14 @@ __event_trigger_test_discard(struct trace_event_file *file,
         if (eflags & EVENT_FILE_FL_TRIGGER_COND)
                 *tt = event_triggers_call(file, entry);
 
-        if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags))
+        if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
+            (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
+             !filter_match_preds(file->filter, entry))) {
                 ring_buffer_discard_commit(buffer, event);
-        else if (!filter_check_discard(file, entry, buffer, event))
-                return false;
+                return true;
+        }
 
-        return true;
+        return false;
 }
 
 /**