Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-27 07:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: Simplify code for showing of soft disabled flag

Browse Source 
Rather than enumerating each permutation, build the enable state
string up from the combination of states.  This also allows for the
simpler addition of more states.

Link: http://lkml.kernel.org/r/9aff5af6dee2f5a40ca30df41c39d5f33e998d7a.1372479499.git.tom.zanussi@linux.intel.com

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Tom Zanussi 2013-06-29 00:08:04 -05:00 committed by Steven Rostedt
parent 3fe3d6193e
commit a439059610
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/trace/trace_events.c
View File

@ -638,17 +638,17 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt,
loff_t *ppos) loff_t *ppos)
{ {
struct ftrace_event_file *file = filp->private_data; struct ftrace_event_file *file = filp->private_data;
char *buf; char buf[4] = "0";
if (file->flags & FTRACE_EVENT_FL_ENABLED) { if (file->flags & FTRACE_EVENT_FL_ENABLED &&
if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED) !(file->flags & FTRACE_EVENT_FL_SOFT_DISABLED))
buf = "0*\n"; strcpy(buf, "1");
else if (file->flags & FTRACE_EVENT_FL_SOFT_MODE)
buf = "1*\n"; if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED ||
else file->flags & FTRACE_EVENT_FL_SOFT_MODE)
buf = "1\n"; strcat(buf, "*");
} else
buf = "0\n"; strcat(buf, "\n");
return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf)); return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf));
} }