Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cbb1506 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 65da9a0a

kernel/trace/trace.c

+0 −13
Original line number Diff line number Diff line
@@ -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)

kernel/trace/trace.h

+6 −7
Original line number Diff line number Diff line
@@ -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,14 +1093,16 @@ __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 false;

}



/**

 * event_trigger_unlock_commit - handle triggers and finish event commit

 * @file: The file pointer assoctiated to the event