iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ftrace: Clean up __seq_open_private() return check

Browse Source 
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>
This commit is contained in:
Steven Rostedt (VMware) 2017-03-29 11:38:13 -04:00
parent 2b87965a1e
commit c1bc5919f6
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/trace/ftrace.c
View File

@ -3355,12 +3355,13 @@ ftrace_avail_open(struct inode *inode, struct file *file)
return -ENODEV; return -ENODEV;
iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter)); iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
if (iter) { if (!iter)
iter->pg = ftrace_pages_start; return -ENOMEM;
iter->ops = &global_ops;
}
return iter ? 0 : -ENOMEM; iter->pg = ftrace_pages_start;
iter->ops = &global_ops;
return 0;
} }
static int static int
@ -3369,13 +3370,14 @@ ftrace_enabled_open(struct inode *inode, struct file *file)
struct ftrace_iterator *iter; struct ftrace_iterator *iter;
iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter)); iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
if (iter) { if (!iter)
iter->pg = ftrace_pages_start; return -ENOMEM;
iter->flags = FTRACE_ITER_ENABLED;
iter->ops = &global_ops;
}
return iter ? 0 : -ENOMEM; iter->pg = ftrace_pages_start;
iter->flags = FTRACE_ITER_ENABLED;
iter->ops = &global_ops;
return 0;
} }
/** /**