Skip to content

Commit

Permalink
tracing: Rename set_tracer_flags()'s local variable trace_flags
Browse files Browse the repository at this point in the history
set_tracer_flags() have a local variable named trace_flags which has
the same name than a global one in the same scope.
This leads to confusion, using tracer_flags should be better by its
meaning.

Changelog:
v1->v2: Simplified another patch in this patchset, no change in this
        patch.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
  • Loading branch information
Zhaolei authored and Frederic Weisbecker committed Aug 11, 2009
1 parent 89034bc commit 7770841
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2118,33 +2118,33 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,
/* Try to assign a tracer specific option */
static int set_tracer_option(struct tracer *trace, char *cmp, int neg)
{
struct tracer_flags *trace_flags = trace->flags;
struct tracer_flags *tracer_flags = trace->flags;
struct tracer_opt *opts = NULL;
int ret = 0, i = 0;
int len;

for (i = 0; trace_flags->opts[i].name; i++) {
opts = &trace_flags->opts[i];
for (i = 0; tracer_flags->opts[i].name; i++) {
opts = &tracer_flags->opts[i];
len = strlen(opts->name);

if (strncmp(cmp, opts->name, len) == 0) {
ret = trace->set_flag(trace_flags->val,
ret = trace->set_flag(tracer_flags->val,
opts->bit, !neg);
break;
}
}
/* Not found */
if (!trace_flags->opts[i].name)
if (!tracer_flags->opts[i].name)
return -EINVAL;

/* Refused to handle */
if (ret)
return ret;

if (neg)
trace_flags->val &= ~opts->bit;
tracer_flags->val &= ~opts->bit;
else
trace_flags->val |= opts->bit;
tracer_flags->val |= opts->bit;

return 0;
}
Expand Down

0 comments on commit 7770841

Please sign in to comment.