tracing/ring-buffer: hide unused last_boot_fops
PATCH 1/1 tracing/ring-buffer: hide unused last_boot_fops
From: Arnd Bergmann <[email protected]>
This variable is used only in an #ifdef, which causes a W=1 warning with some compilers:
kernel/trace/trace.c:7570:37: error: 'last_boot_fops' defined but not used [-Werror=unused-const-variable=]
7570 | static const struct file_operations last_boot_fops = {
Guard this one with the same #ifdef.
---
Alternatively it could be marked as __maybe_unused, but I tried to follow the style used in this file.
--- kernel/trace/trace.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/trace.c +4 -0
@@ -6913,6 +6913,7 @@ tracing_total_entries_read(struct file *filp, char __user *ubuf,return simple_read_from_buffer (ubuf, cnt, ppos, buf, r); } +#ifdef CONFIG_TRACER_SNAPSHOT static ssize_t tracing_last_boot_read (struct file *filp,char __user *ubuf,size_t cnt,loff_t *ppos) {
@@ -6927,6 +6928,7 @@ tracing_last_boot_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t return simple_read_from_buffer(ubuf, cnt, ppos, buf, seq_buf_used(&seq)); } +#endif static int tracing_buffer_meta_open (struct inode *inode,struct file *filp) {
@@ -7567,12 +7569,14 @@ static const struct file_operations trace_time_stamp_mode_fops = { .release = tracing_single_release_tr, }; +#ifdef CONFIG_TRACER_SNAPSHOT static const struct file_operations last_boot_fops = { .open = tracing_open_generic_tr, .read = tracing_last_boot_read, .llseek = generic_file_llseek, .release = tracing_release_generic_tr, }; +#endif #ifdef CONFIG_TRACER_SNAPSHOT static const struct file_operations snapshot_fops = {
Signature · 1 line
2.39.2
Steven Rostedt
maintainerQuoted 5 lines · On Fri, 19 Jul 2024 12:26:33 +0200 Arnd Bergmann <[email protected]> wrote:
From: Arnd Bergmann <[email protected]>
This variable is used only in an #ifdef, which causes a W=1 warning with some compilers:
Quoted 7 lines
kernel/trace/trace.c:7570:37: error: 'last_boot_fops' defined but not used [-Werror=unused-const-variable=]
7570 | static const structfile_operationslast_boot_fops= {Guard this one with the same #ifdef.
Fixes 7a1d1e4b9639 ("tracing/ring-buffer: Add last_boot_info file to boot instance")Signed-off-by Arnd Bergmann <[email protected]>
Actually "last_boot_info" and snapshot should be mutually exclusive. That is, an instance can have a snapshot or the "last_boot_info" but not both. The real fix is:
kernel/trace/trace.c +2 -2
@@ -9828,15 +9828,15 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer)if (ftrace_create_function_files (tr, d_tracer))MEM_FAIL (1 ,"Could not allocate function filter files" ); -#ifdef CONFIG_TRACER_SNAPSHOT if (tr->range_addr_start) {trace_create_file ("last_boot_info" ,TRACE_MODE_READ , d_tracer, tr, &last_boot_fops); +#ifdef CONFIG_TRACER_SNAPSHOT }else {trace_create_file ("snapshot" ,TRACE_MODE_WRITE , d_tracer, tr, &snapshot_fops); - }#endif + }trace_create_file ("error_log" ,TRACE_MODE_WRITE , d_tracer, tr, &tracing_err_log_fops);
I'll write up a patch and give you the "reported-by".
Thanks!
-- Steve