Commit 04aabc32 authored by Song Chen's avatar Song Chen Committed by Steven Rostedt (Google)
Browse files

ring_buffer: Remove unused "event" parameter 

After commit a389d86f ("ring-buffer: Have nested events still record
running time stamp"), the "event" parameter is no longer used in either
ring_buffer_unlock_commit() or rb_commit(). Best to remove it.

Link: https://lkml.kernel.org/r/1666274811-24138-1-git-send-email-chensong_2000@189.cn



Signed-off-by: default avatarSong Chen <chensong_2000@189.cn>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent a01fdc89

include/linux/ring_buffer.h

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ void ring_buffer_change_overwrite(struct trace_buffer *buffer, int val); 


struct ring_buffer_event *ring_buffer_lock_reserve(struct trace_buffer *buffer,

						   unsigned long length);

int ring_buffer_unlock_commit(struct trace_buffer *buffer,

			      struct ring_buffer_event *event);

int ring_buffer_unlock_commit(struct trace_buffer *buffer);

int ring_buffer_write(struct trace_buffer *buffer,

		      unsigned long length, void *data);

kernel/trace/ring_buffer.c

+5 −7
Original line number Diff line number Diff line
@@ -3180,8 +3180,7 @@ static inline void rb_event_discard(struct ring_buffer_event *event) 
		event->time_delta = 1;

}



static void rb_commit(struct ring_buffer_per_cpu *cpu_buffer,

		      struct ring_buffer_event *event)

static void rb_commit(struct ring_buffer_per_cpu *cpu_buffer)

{

	local_inc(&cpu_buffer->entries);

	rb_end_commit(cpu_buffer);
@@ -3383,15 +3382,14 @@ void ring_buffer_nest_end(struct trace_buffer *buffer) 
 *

 * Must be paired with ring_buffer_lock_reserve.

 */

int ring_buffer_unlock_commit(struct trace_buffer *buffer,

			      struct ring_buffer_event *event)

int ring_buffer_unlock_commit(struct trace_buffer *buffer)

{

	struct ring_buffer_per_cpu *cpu_buffer;

	int cpu = raw_smp_processor_id();



	cpu_buffer = buffer->buffers[cpu];



	rb_commit(cpu_buffer, event);

	rb_commit(cpu_buffer);



	rb_wakeups(buffer, cpu_buffer);
@@ -3977,7 +3975,7 @@ int ring_buffer_write(struct trace_buffer *buffer, 


	memcpy(body, data, length);



	rb_commit(cpu_buffer, event);

	rb_commit(cpu_buffer);



	rb_wakeups(buffer, cpu_buffer);
@@ -5998,7 +5996,7 @@ static __init int rb_write_something(struct rb_test_data *data, bool nested) 
	}



 out:

	ring_buffer_unlock_commit(data->buffer, event);

	ring_buffer_unlock_commit(data->buffer);



	return 0;

}

kernel/trace/ring_buffer_benchmark.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static void ring_buffer_producer(void) 
				hit++;

				entry = ring_buffer_event_data(event);

				*entry = smp_processor_id();

				ring_buffer_unlock_commit(buffer, event);

				ring_buffer_unlock_commit(buffer);

			}

		}

		end_time = ktime_get();

kernel/trace/trace.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ __buffer_unlock_commit(struct trace_buffer *buffer, struct ring_buffer_event *ev 
		/* ring_buffer_unlock_commit() enables preemption */

		preempt_enable_notrace();

	} else

		ring_buffer_unlock_commit(buffer, event);

		ring_buffer_unlock_commit(buffer);

}



/**