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>

diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 3c7d295746f67e050d6b9296204ec56d7892ff72..782e14f62201f7c76e911886b3ef263d116a3298 100644 (file)
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -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);
 

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index b21bf14bae9bd5d519d0d0b864386003cb243fdb..843818ee4814e400aac7ee68cb3c7de38e9ff989 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -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;
 }

diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c
index 78e576575b79ecad5102dd86b53354c76222556b..aef34673d79d08bc8adcf228f212e054d813a5e5 100644 (file)
--- a/kernel/trace/ring_buffer_benchmark.c
+++ b/kernel/trace/ring_buffer_benchmark.c
@@ -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();

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5cfc95a52bc37876ca4d930e8ff8ecd76c307d68..5c97dbef741b499166cd29986cd4dbbe386e02f6 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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);
 }
 
 /**