public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Tom Zanussi <zanussi@kernel.org>,
	Petr Pavlu <petr.pavlu@suse.com>
Subject: [for-next][PATCH 02/13] tracing: Remove unnecessary check for EVENT_FILE_FL_FREED
Date: Thu, 26 Mar 2026 10:26:58 -0400	[thread overview]
Message-ID: <20260326142716.325097418@kernel.org> (raw)
In-Reply-To: 20260326142656.794462952@kernel.org

From: Petr Pavlu <petr.pavlu@suse.com>

The event_filter_write() function calls event_file_file() to retrieve
a trace_event_file associated with a given file struct. If a non-NULL
pointer is returned, the function then checks whether the trace_event_file
instance has the EVENT_FILE_FL_FREED flag set. This check is redundant
because event_file_file() already performs this validation and returns NULL
if the flag is set. The err value is also already initialized to -ENODEV.

Remove the unnecessary check for EVENT_FILE_FL_FREED in
event_filter_write().

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Tom Zanussi <zanussi@kernel.org>
Link: https://patch.msgid.link/20260219162737.314231-4-petr.pavlu@suse.com
Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace_events.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 249d1cba72c0..26d1e95a55d1 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2247,12 +2247,8 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
 	mutex_lock(&event_mutex);
 	file = event_file_file(filp);
-	if (file) {
-		if (file->flags & EVENT_FILE_FL_FREED)
-			err = -ENODEV;
-		else
-			err = apply_event_filter(file, buf);
-	}
+	if (file)
+		err = apply_event_filter(file, buf);
 	mutex_unlock(&event_mutex);
 
 	kfree(buf);
-- 
2.51.0



  parent reply	other threads:[~2026-03-26 14:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-26 14:26 [for-next][PATCH 00/13] tracing: Updates for 7.1 Steven Rostedt
2026-03-26 14:26 ` [for-next][PATCH 01/13] tracing: move __printf() attribute on __ftrace_vbprintk() Steven Rostedt
2026-03-26 14:26 ` Steven Rostedt [this message]
2026-03-26 14:26 ` [for-next][PATCH 03/13] tracing: Clean up access to trace_event_file from a file pointer Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 04/13] tracing: Free up file->private_data for use by individual events Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 05/13] tracing: Pretty-print enum parameters in function arguments Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 06/13] tracing: trace_mmap.h: fix a kernel-doc warning Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 07/13] tracepoint: Add trace_call__##name() API Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 08/13] kernel: Use trace_call__##name() at guarded tracepoint call sites Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 09/13] i2c: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 10/13] spi: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 11/13] btrfs: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 12/13] mm: damon: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 13/13] tracing: Move snapshot code out of trace.c and into trace_snapshot.c Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260326142716.325097418@kernel.org \
    --to=rostedt@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    --cc=petr.pavlu@suse.com \
    --cc=zanussi@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox