diff options
| author | Vincent Donnefort <vdonnefort@google.com> | 2026-09-08 10:09:37 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2026-10-15 18:28:41 -0400 |
| commit | c28bf729dd9c73408fca2645b75c3fda187b11a3 (patch) | |
| tree | 6a7b5839a7d1b4578f99cfb132641e44a28d2771 /kernel/trace | |
| parent | e41338909f32d48aceaa3058f6b56578e1d0ecf7 (diff) | |
tracing: Rename tracing_entries_fops to tracing_capacity_fops
Since commit 8a5f63637890 ("ring-buffer: Fix subbuf resize race with
ring buffer readers"), "capacity" refers to the memory available for
events, while "entries" refers to the number of events in a ring buffer.
As a consequence, rename trace_array::entries to capacity to align with
this convention.
While at it, rename also tracing_total_entries_fops. It is the aggragate
of all ring buffer capacities.
Link: https://patch.msgid.link/20260908090937.838544-4-vdonnefort@google.com
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9e1b5c35f6a9..48ecc4bb55e4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5672,8 +5672,7 @@ tracing_syscall_buf_write(struct file *filp, const char __user *ubuf, } static ssize_t -tracing_entries_read(struct file *filp, char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_capacity_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) { struct inode *inode = file_inode(filp); struct trace_array *tr = inode->i_private; @@ -5720,8 +5719,7 @@ tracing_entries_read(struct file *filp, char __user *ubuf, } static ssize_t -tracing_entries_write(struct file *filp, const char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_capacity_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { struct inode *inode = file_inode(filp); struct trace_array *tr = inode->i_private; @@ -5748,8 +5746,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf, } static ssize_t -tracing_total_entries_read(struct file *filp, char __user *ubuf, - size_t cnt, loff_t *ppos) +tracing_total_capacity_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) { struct trace_array *tr = filp->private_data; char buf[64]; @@ -6600,10 +6597,10 @@ static const struct file_operations tracing_pipe_fops = { .release = tracing_release_pipe, }; -static const struct file_operations tracing_entries_fops = { +static const struct file_operations tracing_capacity_fops = { .open = tracing_open_generic_tr, - .read = tracing_entries_read, - .write = tracing_entries_write, + .read = tracing_capacity_read, + .write = tracing_capacity_write, .llseek = generic_file_llseek, .release = tracing_release_generic_tr, }; @@ -6623,9 +6620,9 @@ static const struct file_operations tracing_buffer_meta_fops = { .release = tracing_seq_release, }; -static const struct file_operations tracing_total_entries_fops = { +static const struct file_operations tracing_total_capacity_fops = { .open = tracing_open_generic_tr, - .read = tracing_total_entries_read, + .read = tracing_total_capacity_read, .llseek = generic_file_llseek, .release = tracing_release_generic_tr, }; @@ -7653,7 +7650,7 @@ tracing_init_tracefs_percpu(struct trace_array *tr, long cpu) tr, cpu, &tracing_stats_fops); trace_create_cpu_file("buffer_size_kb", TRACE_MODE_WRITE, d_cpu, - tr, cpu, &tracing_entries_fops); + tr, cpu, &tracing_capacity_fops); if (tr->range_addr_start) trace_create_cpu_file("buffer_meta", TRACE_MODE_READ, d_cpu, @@ -8998,10 +8995,10 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer) tr, &tracing_pipe_fops); trace_create_file("buffer_size_kb", writable_mode, d_tracer, - tr, &tracing_entries_fops); + tr, &tracing_capacity_fops); trace_create_file("buffer_total_size_kb", TRACE_MODE_READ, d_tracer, - tr, &tracing_total_entries_fops); + tr, &tracing_total_capacity_fops); trace_create_file("trace_clock", writable_mode, d_tracer, tr, &trace_clock_fops); |