Skip to content

Commit

Permalink
ftrace: use seq_read
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Lai Jiangshan authored and Ingo Molnar committed Mar 13, 2009
1 parent fa9d13c commit 850a80c
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -1882,15 +1872,15 @@ 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,
};

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,
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 850a80c

Please sign in to comment.