From: Wei Yang <richard.weiyang@linux.alibaba.com>
To: rostedt@goodmis.org, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org,
Wei Yang <richard.weiyang@linux.alibaba.com>
Subject: [PATCH 1/6] ftrace: define seq_file only for FMODE_READ
Date: Mon, 31 Aug 2020 11:10:59 +0800 [thread overview]
Message-ID: <20200831031104.23322-2-richard.weiyang@linux.alibaba.com> (raw)
In-Reply-To: <20200831031104.23322-1-richard.weiyang@linux.alibaba.com>
The purpose of the operation is to get ftrace_iterator, which is embedded
in file or seq_file for FMODE_WRITE/FMODE_READ respectively. Since we
don't have a seq_file for FMODE_WRITE case, it is meaningless to cast
file->private_data to seq_file.
Let's move the definition when there is a valid seq_file.
Signed-off-by: Wei Yang <richard.weiyang@linux.alibaba.com>
---
kernel/trace/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index edc233122598..12cb535769bc 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5558,7 +5558,6 @@ static void __init set_ftrace_early_filters(void)
int ftrace_regex_release(struct inode *inode, struct file *file)
{
- struct seq_file *m = (struct seq_file *)file->private_data;
struct ftrace_iterator *iter;
struct ftrace_hash **orig_hash;
struct trace_parser *parser;
@@ -5566,6 +5565,7 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
int ret;
if (file->f_mode & FMODE_READ) {
+ struct seq_file *m = file->private_data;
iter = m->private;
seq_release(inode, file);
} else
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2020-08-31 3:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 3:10 [PATCH 0/6] ftrace: trivial cleanup Wei Yang
2020-08-31 3:10 ` Wei Yang [this message]
2020-10-06 14:36 ` [PATCH 1/6] ftrace: define seq_file only for FMODE_READ Steven Rostedt
2020-10-08 3:34 ` Wei Yang
2020-08-31 3:11 ` [PATCH 2/6] ftrace: use fls() to get the bits for dup_hash() Wei Yang
2020-08-31 3:11 ` [PATCH 3/6] ftrace: simplify the dyn_ftrace->flags macro Wei Yang
2020-08-31 3:11 ` [PATCH 4/6] ftrace: simplify the calculation of page number for ftrace_page->records Wei Yang
2020-08-31 3:11 ` [PATCH 5/6] ftrace: replace do_for_each_ftrace_rec() with for_ftrace_rec_iter() Wei Yang
2020-10-06 14:42 ` Steven Rostedt
2020-10-08 3:34 ` Wei Yang
2020-08-31 3:11 ` [PATCH 6/6] ftrace: ftrace_global_list is renamed to ftrace_ops_list Wei Yang
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=20200831031104.23322-2-richard.weiyang@linux.alibaba.com \
--to=richard.weiyang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).