Messages in this thread | | | Date | Thu, 6 Aug 2009 05:50:23 +0200 | From | Frederic Weisbecker <> | Subject | Re: [PATCH 1/2] ftrace: Rename set_tracer_flags()'s local variable trace_flags |
| |
On Thu, Aug 06, 2009 at 11:26:51AM +0800, Zhaolei wrote: > set_tracer_flags() have a local variable named trace_flags which have > same name with global one. > Actually, using tracer_flags should be better by its meaning. > > [ Impact: cleanup ] > > Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
> --- > kernel/trace/trace.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > index e30e6b1..464b7bb 100644 > --- a/kernel/trace/trace.c > +++ b/kernel/trace/trace.c > @@ -2291,23 +2291,23 @@ 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 */ > @@ -2315,9 +2315,9 @@ static int set_tracer_option(struct tracer *trace, char *cmp, int neg) > 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; > } > -- > 1.5.5.3 > >
| |