Skip to content

Commit

Permalink
ftrace: Clean up __seq_open_private() return check
Browse files Browse the repository at this point in the history
The return status check of __seq_open_private() is rather strange:

	iter = __seq_open_private();
	if (iter) {
		/* do stuff */
	}

	return iter ? 0 : -ENOMEM;

It makes much more sense to do the return of failure right away:

	iter = __seq_open_private();
	if (!iter)
		return -ENOMEM;

	/* do stuff */

	return 0;

This clean up will make updates to this code a bit nicer.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
rostedt committed Mar 31, 2017
1 parent 2b87965 commit c1bc591
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3355,12 +3355,13 @@ ftrace_avail_open(struct inode *inode, struct file *file)
return -ENODEV;

iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
if (iter) {
iter->pg = ftrace_pages_start;
iter->ops = &global_ops;
}
if (!iter)
return -ENOMEM;

return iter ? 0 : -ENOMEM;
iter->pg = ftrace_pages_start;
iter->ops = &global_ops;

return 0;
}

static int
Expand All @@ -3369,13 +3370,14 @@ ftrace_enabled_open(struct inode *inode, struct file *file)
struct ftrace_iterator *iter;

iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
if (iter) {
iter->pg = ftrace_pages_start;
iter->flags = FTRACE_ITER_ENABLED;
iter->ops = &global_ops;
}
if (!iter)
return -ENOMEM;

return iter ? 0 : -ENOMEM;
iter->pg = ftrace_pages_start;
iter->flags = FTRACE_ITER_ENABLED;
iter->ops = &global_ops;

return 0;
}

/**
Expand Down

0 comments on commit c1bc591

Please sign in to comment.