ftrace: use seq_read
PATCH 1/1 ftrace: use seq_read
Impact: cleanup
VFS layer has tested the file mode, we do not need test it.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/trace/ftrace.c +3 -23
@@ -1118,16 +1118,6 @@ ftrace_notrace_open(struct inode *inode, struct file *file)return ftrace_regex_open (inode, file,0 ); } -static ssize_t -ftrace_regex_read (struct file *file,char __user *ubuf, -size_t cnt,loff_t *ppos) -{ -if (file->f_mode &FMODE_READ ) -return seq_read (file, ubuf, cnt, ppos); -else -return -EPERM ; -} -static loff_t ftrace_regex_lseek (struct file *file,loff_t offset,int origin) {
@@ -1880,7 +1870,7 @@ static const struct file_operations ftrace_failures_fops = {static const struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, - .read = ftrace_regex_read, + .read = seq_read, .write = ftrace_filter_write, .llseek = ftrace_regex_lseek, .release = ftrace_filter_release,
@@ -1888,7 +1878,7 @@ static const struct file_operations ftrace_filter_fops = {static const struct file_operations ftrace_notrace_fops = { .open = ftrace_notrace_open, - .read = ftrace_regex_read, + .read = seq_read, .write = ftrace_notrace_write, .llseek = ftrace_regex_lseek, .release = ftrace_notrace_release,
@@ -1990,16 +1980,6 @@ ftrace_graph_open(struct inode *inode, struct file *file)return ret; } -static ssize_t -ftrace_graph_read (struct file *file,char __user *ubuf, -size_t cnt,loff_t *ppos) -{ -if (file->f_mode &FMODE_READ ) -return seq_read (file, ubuf, cnt, ppos); -else -return -EPERM ; -} -static int ftrace_set_func (unsigned long *array,int *idx,char *buffer) {
@@ -2130,7 +2110,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,static const struct file_operations ftrace_graph_fops = { .open = ftrace_graph_open, - .read = ftrace_graph_read, + .read = seq_read, .write = ftrace_graph_write, };#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
Commit-ID: 850a80cfaa5aec3e626eb3736eff890a80e4fa77 Gitweb: http://git.kernel.org/tip/850a80cfaa5aec3e626eb3736eff890a80e4fa77 Author: Lai Jiangshan <[email protected]> AuthorDate: Fri, 13 Mar 2009 17:47:23 +0800 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 13 Mar 2009 11:35:31 +0100
ftrace: use seq_read
Impact: cleanup
VFS layer has tested the file mode, we do not need test it.
Signed-off-by Lai Jiangshan <[email protected]>
Cc Steven Rostedt <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/trace/ftrace.c | 26 +++----------------------- 1 files changed, 3 insertions(+), 23 deletions(-)
kernel/trace/ftrace.c +3 -23
@@ -1120,16 +1120,6 @@ ftrace_notrace_open(struct inode *inode, struct file *file)return ftrace_regex_open (inode, file,0 ); } -static ssize_t -ftrace_regex_read (struct file *file,char __user *ubuf, -size_t cnt,loff_t *ppos) -{ -if (file->f_mode &FMODE_READ ) -return seq_read (file, ubuf, cnt, ppos); -else -return -EPERM ; -} -static loff_t ftrace_regex_lseek (struct file *file,loff_t offset,int origin) {
@@ -1882,7 +1872,7 @@ static const struct file_operations ftrace_failures_fops = {static const struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, - .read = ftrace_regex_read, + .read = seq_read, .write = ftrace_filter_write, .llseek = ftrace_regex_lseek, .release = ftrace_filter_release,
@@ -1890,7 +1880,7 @@ static const struct file_operations ftrace_filter_fops = {static const struct file_operations ftrace_notrace_fops = { .open = ftrace_notrace_open, - .read = ftrace_regex_read, + .read = seq_read, .write = ftrace_notrace_write, .llseek = ftrace_regex_lseek, .release = ftrace_notrace_release,
@@ -1992,16 +1982,6 @@ ftrace_graph_open(struct inode *inode, struct file *file)return ret; } -static ssize_t -ftrace_graph_read (struct file *file,char __user *ubuf, -size_t cnt,loff_t *ppos) -{ -if (file->f_mode &FMODE_READ ) -return seq_read (file, ubuf, cnt, ppos); -else -return -EPERM ; -} -static int ftrace_set_func (unsigned long *array,int *idx,char *buffer) {
@@ -2132,7 +2112,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,static const struct file_operations ftrace_graph_fops = { .open = ftrace_graph_open, - .read = ftrace_graph_read, + .read = seq_read, .write = ftrace_graph_write, };#endif /* CONFIG_FUNCTION_GRAPH_TRACER */