Skip to content

Commit c1bc591

Browse files
committed
ftrace: Clean up __seq_open_private() return check
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>
1 parent 2b87965 commit c1bc591

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

kernel/trace/ftrace.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3355,12 +3355,13 @@ ftrace_avail_open(struct inode *inode, struct file *file)
33553355
return -ENODEV;
33563356

33573357
iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
3358-
if (iter) {
3359-
iter->pg = ftrace_pages_start;
3360-
iter->ops = &global_ops;
3361-
}
3358+
if (!iter)
3359+
return -ENOMEM;
33623360

3363-
return iter ? 0 : -ENOMEM;
3361+
iter->pg = ftrace_pages_start;
3362+
iter->ops = &global_ops;
3363+
3364+
return 0;
33643365
}
33653366

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

33713372
iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
3372-
if (iter) {
3373-
iter->pg = ftrace_pages_start;
3374-
iter->flags = FTRACE_ITER_ENABLED;
3375-
iter->ops = &global_ops;
3376-
}
3373+
if (!iter)
3374+
return -ENOMEM;
33773375

3378-
return iter ? 0 : -ENOMEM;
3376+
iter->pg = ftrace_pages_start;
3377+
iter->flags = FTRACE_ITER_ENABLED;
3378+
iter->ops = &global_ops;
3379+
3380+
return 0;
33793381
}
33803382

33813383
/**

0 commit comments

Comments
 (0)