ftrace: use seq_read
authorLai Jiangshan <laijs@cn.fujitsu.com>
Fri, 13 Mar 2009 09:47:23 +0000 (17:47 +0800)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 10:35:31 +0000 (11:35 +0100)
Impact: cleanup

VFS layer has tested the file mode, we do not need test it.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <srostedt@redhat.com>
LKML-Reference: <49BA2BAB.6010608@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c

index 08f4a624e31f42fde51d482c1f528a747b307fa7..bf78a4c75c67a2abbaf8e398c65ed92e5177e8f9 100644 (file)
@@ -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 */