Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ring_buffer: Remove unused "event" parameter

After commit a389d86f7fd0 ("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: Song Chen <chensong_2000@189.cn>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

authored by

Song Chen and committed by
Steven Rostedt (Google)
04aabc32 a01fdc89

+8 -11
+1 -2
include/linux/ring_buffer.h
··· 113 113 114 114 struct ring_buffer_event *ring_buffer_lock_reserve(struct trace_buffer *buffer, 115 115 unsigned long length); 116 - int ring_buffer_unlock_commit(struct trace_buffer *buffer, 117 - struct ring_buffer_event *event); 116 + int ring_buffer_unlock_commit(struct trace_buffer *buffer); 118 117 int ring_buffer_write(struct trace_buffer *buffer, 119 118 unsigned long length, void *data); 120 119
+5 -7
kernel/trace/ring_buffer.c
··· 3180 3180 event->time_delta = 1; 3181 3181 } 3182 3182 3183 - static void rb_commit(struct ring_buffer_per_cpu *cpu_buffer, 3184 - struct ring_buffer_event *event) 3183 + static void rb_commit(struct ring_buffer_per_cpu *cpu_buffer) 3185 3184 { 3186 3185 local_inc(&cpu_buffer->entries); 3187 3186 rb_end_commit(cpu_buffer); ··· 3382 3383 * 3383 3384 * Must be paired with ring_buffer_lock_reserve. 3384 3385 */ 3385 - int ring_buffer_unlock_commit(struct trace_buffer *buffer, 3386 - struct ring_buffer_event *event) 3386 + int ring_buffer_unlock_commit(struct trace_buffer *buffer) 3387 3387 { 3388 3388 struct ring_buffer_per_cpu *cpu_buffer; 3389 3389 int cpu = raw_smp_processor_id(); 3390 3390 3391 3391 cpu_buffer = buffer->buffers[cpu]; 3392 3392 3393 - rb_commit(cpu_buffer, event); 3393 + rb_commit(cpu_buffer); 3394 3394 3395 3395 rb_wakeups(buffer, cpu_buffer); 3396 3396 ··· 3975 3977 3976 3978 memcpy(body, data, length); 3977 3979 3978 - rb_commit(cpu_buffer, event); 3980 + rb_commit(cpu_buffer); 3979 3981 3980 3982 rb_wakeups(buffer, cpu_buffer); 3981 3983 ··· 5996 5998 } 5997 5999 5998 6000 out: 5999 - ring_buffer_unlock_commit(data->buffer, event); 6001 + ring_buffer_unlock_commit(data->buffer); 6000 6002 6001 6003 return 0; 6002 6004 }
+1 -1
kernel/trace/ring_buffer_benchmark.c
··· 258 258 hit++; 259 259 entry = ring_buffer_event_data(event); 260 260 *entry = smp_processor_id(); 261 - ring_buffer_unlock_commit(buffer, event); 261 + ring_buffer_unlock_commit(buffer); 262 262 } 263 263 } 264 264 end_time = ktime_get();
+1 -1
kernel/trace/trace.c
··· 999 999 /* ring_buffer_unlock_commit() enables preemption */ 1000 1000 preempt_enable_notrace(); 1001 1001 } else 1002 - ring_buffer_unlock_commit(buffer, event); 1002 + ring_buffer_unlock_commit(buffer); 1003 1003 } 1004 1004 1005 1005 /**