Re: [patch] trace: find the correct ftrace event

[Dan Carpenter <error27@gmail.com>]

On Sat, Mar 20, 2010 at 09:37:13AM -0400, Steven Rostedt wrote:
> On Sat, 2010-03-20 at 16:19 +0300, Dan Carpenter wrote:
> > The original code doesn't work because "call" is never NULL there.
> 
> A one line change would have done the same ;-)
> 
> > Signed-off-by: Dan Carpenter <error27@gmail.com>
> > ---
> > My code should work, but it seems like there should but it seems like
> > there should be a more elegant way to do this?
> > 
> > diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
> > index 4615f62..6070c70 100644
> > --- a/kernel/trace/trace_events_filter.c
> > +++ b/kernel/trace/trace_events_filter.c
> > @@ -1388,16 +1388,19 @@ int ftrace_profile_set_filter(struct perf_event *event, int event_id,
> >  	struct event_filter *filter;
> >  	struct filter_parse_state *ps;
> >  	struct ftrace_event_call *call = NULL;
> > +	int found = 0;
> >  
> >  	mutex_lock(&event_mutex);
> >  
> >  	list_for_each_entry(call, &ftrace_events, list) {
> > -		if (call->id == event_id)
> > +		if (call->id == event_id) {
> > +			found = 1;
> >  			break;
> > +		}
> >  	}
> >  
> >  	err = -EINVAL;
> > -	if (!call)
> 
> 	if (call == &ftrace_events)
> 

Man...  That makes my head hurt.  It only works because ->list is the 
first element in the struct.

We'd need a cast.

Is that really cleaner?

regards,
dan carpenter

> -- Steve
> 
> > +	if (!found)
> >  		goto out_unlock;
> >  
> >  	err = -EEXIST;
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/